tor-commits February 2020

tor-commits@lists.torproject.org

22 participants
1454 discussions

[bridgedb/develop] Fix persistence tests
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit e893c41565345720997a6195a498e37a6a455039 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 14 13:08:03 2020 -0800 Fix persistence tests Nothing too interesting. Few files needed to be opened in bytes mode and a deprecated os function replaced... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_persistent.py", line 53, in setUp fakeArgs = ['-c', os.path.join(os.getcwdu(), '..', 'bridgedb.conf')] builtins.AttributeError: module 'os' has no attribute 'getcwdu' Test results changed as follows... before: FAILED (skips=109, failures=24, errors=349, successes=498) after: FAILED (skips=109, failures=22, errors=318, successes=531) --- bridgedb/parse/options.py | 2 +- bridgedb/persistent.py | 11 ++++++++--- bridgedb/test/test_persistent.py | 2 +- bridgedb/test/test_persistentSaveAndLoad.py | 6 +++--- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/bridgedb/parse/options.py b/bridgedb/parse/options.py index 0eeb79e..c32ada3 100644 --- a/bridgedb/parse/options.py +++ b/bridgedb/parse/options.py @@ -206,7 +206,7 @@ class BaseOptions(usage.Options): if rundir is not None: gRundir = os.path.abspath(os.path.expanduser(rundir)) else: - gRundir = os.getcwdu() + gRundir = os.getcwd() setRundir(gRundir) if not os.path.isdir(gRundir): # pragma: no cover diff --git a/bridgedb/persistent.py b/bridgedb/persistent.py index 89d3dd4..3d52ec5 100644 --- a/bridgedb/persistent.py +++ b/bridgedb/persistent.py @@ -128,6 +128,11 @@ class State(jelly.Jellyable): :param string statefile: The filename of the statefile. """ + + if filename is None: + self._statefile = None + return + filename = os.path.abspath(os.path.expanduser(filename)) logging.debug("Setting statefile to '%s'" % filename) self._statefile = filename @@ -173,8 +178,8 @@ class State(jelly.Jellyable): err = '' try: - if isinstance(statefile, str): - fh = open(statefile, 'r') + if isinstance(statefile, (str, bytes)): + fh = open(statefile, 'rb') elif not statefile.closed: fh = statefile except (IOError, OSError) as error: # pragma: no cover @@ -209,7 +214,7 @@ class State(jelly.Jellyable): fh = None try: - fh = open(statefile, 'w') + fh = open(statefile, 'wb') except (IOError, OSError) as error: # pragma: no cover logging.warn("Error writing state file to '%s': %s" % (statefile, error)) diff --git a/bridgedb/test/test_persistent.py b/bridgedb/test/test_persistent.py index 269cc86..21aa67f 100644 --- a/bridgedb/test/test_persistent.py +++ b/bridgedb/test/test_persistent.py @@ -50,7 +50,7 @@ class StateTest(unittest.TestCase): exec(compiled, configuration) config = persistent.Conf(**configuration) - fakeArgs = ['-c', os.path.join(os.getcwdu(), '..', 'bridgedb.conf')] + fakeArgs = ['-c', os.path.join(os.getcwd(), '..', 'bridgedb.conf')] options = MainOptions() options.parseOptions(fakeArgs) diff --git a/bridgedb/test/test_persistentSaveAndLoad.py b/bridgedb/test/test_persistentSaveAndLoad.py index d01a536..bcdcdd7 100644 --- a/bridgedb/test/test_persistentSaveAndLoad.py +++ b/bridgedb/test/test_persistentSaveAndLoad.py @@ -58,8 +58,8 @@ class StateSaveAndLoadTests(unittest.TestCase): self.assertNotIdentical(self.state, loadedState) self.assertNotEqual(self.state, loadedState) - self.assertEqual(self.state.__dict__.keys().sort(), - loadedState.__dict__.keys().sort()) + self.assertEqual(list(self.state.__dict__.keys()).sort(), + list(loadedState.__dict__.keys()).sort()) def savedStateAssertions(self, savedStatefile=None): self.assertTrue(os.path.isfile(str(self.state.statefile))) @@ -148,7 +148,7 @@ class StateSaveAndLoadTests(unittest.TestCase): self.state.load, 'quux.state') def test_load_with_statefile_opened(self): - fh = open('quux.state', 'w+') + fh = open('quux.state', 'wb+') self.assertRaises(persistent.MissingState, self.state.load, fh) fh.close()

1 0

[bridgedb/develop] Error concatenating range with a list
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit f76c06102fe83417dc7c391c9c614f7fd54ff8c0 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 15 17:19:08 2020 -0800 Error concatenating range with a list BridgeDB relies on catch-alls to address its underlying buginess, which is making this harder. Removed one to uncover our http_server's actual exception... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_https_server.py", line 740, in test_renderAnswer_GET_textplain_malicious page = self.bridgesResource.render(request) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/distributors/https/server.py", line 920, in render response = self.getBridgeRequestAnswer(request) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/distributors/https/server.py", line 967, in getBridgeRequestAnswer bridgeRequest, self.includeFingerprints)) for bridge in bridges] File "/home/atagar/Desktop/tor/bridgedb/bridgedb/distributors/https/server.py", line 967, in <listcomp> bridgeRequest, self.includeFingerprints)) for bridge in bridges] File "/home/atagar/Desktop/tor/bridgedb/bridgedb/util.py", line 266, in replaceControlChars if byte in range(0, 32) + [92, 127]: builtins.TypeError: unsupported operand type(s) for +: 'range' and 'list' Test results changed as follows... before: FAILED (skips=109, failures=24, errors=220, successes=628) after: FAILED (skips=109, failures=19, errors=221, successes=632) --- bridgedb/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/util.py b/bridgedb/util.py index eb20ce7..7b68831 100644 --- a/bridgedb/util.py +++ b/bridgedb/util.py @@ -263,7 +263,7 @@ def replaceControlChars(text, replacement=None, encoding="utf-8"): escaped = bytearray() for byte in bytearray(text, encoding): - if byte in range(0, 32) + [92, 127]: + if byte in list(range(0, 32)) + [92, 127]: if replacement: byte = replacement else:

1 0

[bridgedb/develop] Convert generators to lists
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 75f876ee89226977d358c2dfc42b931ac94f3430 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 17 12:20:30 2020 -0800 Convert generators to lists Python 3 changes several builtins to provide generators rather than lists. This is more efficient, but means we need to convert to a list to be indexable. There will likely be more instances down the road, but fixing all the instances that are immediately evedant in the test output. This fixes... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_proxy.py", line 355, in test_ProxySet_addProxies_tuple_individual_tags self.assertEquals(len(self.proxyList), len(self.proxies) + len(extraProxies)) builtins.TypeError: object of type 'zip' has no len() Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_parse_headers.py", line 47, in test_addNonLocalizedVariant langs = headers.parseAcceptLanguage(header) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/parse/headers.py", line 70, in parseAcceptLanguage placement = langs.index(insertAfter[0]) + 1 builtins.TypeError: 'filter' object is not subscriptable Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_bridges.py", line 895, in setUp self._parseAllDescriptorFiles() File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_bridges.py", line 852, in _parseAllDescriptorFiles self._extrainfoFile).values()[0] builtins.TypeError: 'dict_values' object does not support indexing Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_bridges.py", line 315, in test_integration_getConfigLine_scramblesuit_withFingerprint transport='scramblesuit') File "/home/atagar/Desktop/tor/bridgedb/bridgedb/bridges.py", line 847, in getConfigLine bridgeLine = self.getBridgeLine(bridgeRequest, includeFingerprint) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/bridges.py", line 1362, in getBridgeLine pt = self._getTransportForRequest(bridgeRequest) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/bridges.py", line 1196, in _getTransportForRequest return transports[position % len(unblocked)] builtins.TypeError: 'filter' object is not subscriptable Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_Bridges.py", line 78, in test_filterDistinctSubnets_random_bridges chosen = self.ring.bridges.keys()[:3] builtins.TypeError: 'dict_keys' object is not subscriptable Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_Bridges.py", line 65, in test_filterDistinctSubnets chosen = self.ring.bridges.keys()[:10] builtins.TypeError: 'dict_keys' object is not subscriptable Test results changed as follows... before: FAILED (skips=114, failures=13, errors=191, successes=663) after: FAILED (skips=114, failures=14, errors=158, successes=695) --- bridgedb/bridges.py | 2 +- bridgedb/parse/headers.py | 4 ++-- bridgedb/test/test_Bridges.py | 4 ++-- bridgedb/test/test_bridges.py | 8 ++++---- bridgedb/test/test_proxy.py | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bridgedb/bridges.py b/bridgedb/bridges.py index ca1330b..a611c47 100644 --- a/bridgedb/bridges.py +++ b/bridgedb/bridges.py @@ -1177,7 +1177,7 @@ class Bridge(BridgeBackwardsCompatibility): # their ``methodname`` matches the requested transport: transports = filter(lambda pt: pt.methodname == desired, self.transports) # Filter again for whichever of IPv4 or IPv6 was requested: - transports = filter(lambda pt: pt.address.version == ipVersion, transports) + transports = list(filter(lambda pt: pt.address.version == ipVersion, transports)) if not transports: raise PluggableTransportUnavailable( diff --git a/bridgedb/parse/headers.py b/bridgedb/parse/headers.py index 5c3597a..fa8cbf2 100644 --- a/bridgedb/parse/headers.py +++ b/bridgedb/parse/headers.py @@ -64,8 +64,8 @@ def parseAcceptLanguage(header): for only in langsOnly: if only not in langs: # Add the fallback after the other languages like it: - insertAfter = filter(lambda x: x.startswith(only), - [x for x in langs]) + insertAfter = list(filter(lambda x: x.startswith(only), + [x for x in langs])) if insertAfter: placement = langs.index(insertAfter[0]) + 1 langs.insert(placement, only) diff --git a/bridgedb/test/test_Bridges.py b/bridgedb/test/test_Bridges.py index 5991952..19ab09c 100644 --- a/bridgedb/test/test_Bridges.py +++ b/bridgedb/test/test_Bridges.py @@ -62,7 +62,7 @@ class BridgeRingTests(unittest.TestCase): """ self.addBridgesFromSameSubnet() - chosen = self.ring.bridges.keys()[:10] + chosen = list(self.ring.bridges.keys())[:10] bridges = self.ring.filterDistinctSubnets(chosen) # Since they're all in the same /16, we should only get one @@ -75,7 +75,7 @@ class BridgeRingTests(unittest.TestCase): """ self.addRandomBridges() - chosen = self.ring.bridges.keys()[:3] + chosen = list(self.ring.bridges.keys())[:3] bridges = self.ring.filterDistinctSubnets(chosen) self.assertGreaterEqual(len(bridges), 1) diff --git a/bridgedb/test/test_bridges.py b/bridgedb/test/test_bridges.py index f2c2876..cf0ee23 100644 --- a/bridgedb/test/test_bridges.py +++ b/bridgedb/test/test_bridges.py @@ -848,10 +848,10 @@ class BridgeTests(unittest.TestCase): self._networkstatusFile)[0] self.serverdescriptor = descriptors.parseServerDescriptorsFile( self._serverDescriptorFile)[0] - self.extrainfo = descriptors.parseExtraInfoFiles( - self._extrainfoFile).values()[0] - self.extrainfoNew = descriptors.parseExtraInfoFiles( - self._extrainfoNewFile).values()[0] + self.extrainfo = list(descriptors.parseExtraInfoFiles( + self._extrainfoFile).values())[0] + self.extrainfoNew = list(descriptors.parseExtraInfoFiles( + self._extrainfoNewFile).values())[0] def _writeNetworkstatus(self, networkstatus): with open(self._networkstatusFile, 'w') as fh: diff --git a/bridgedb/test/test_proxy.py b/bridgedb/test/test_proxy.py index 74290bc..69b2b99 100644 --- a/bridgedb/test/test_proxy.py +++ b/bridgedb/test/test_proxy.py @@ -350,7 +350,7 @@ class ProxySetUnittests(unittest.TestCase): whatever tags we want. """ tags = ['foo', 'bar', 'baz'] - extraProxies = zip(self.moarProxies, tags) + extraProxies = list(zip(self.moarProxies, tags)) self.proxyList.addProxies(extraProxies) self.assertEquals(len(self.proxyList), len(self.proxies) + len(extraProxies)) self.assertIn(extraProxies[0][0], self.proxyList)

1 0

[bridgedb/develop] Syntax error due to long integer syntax
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 61472aee2f50cd9b2b02e4045f04ceee44ea4970 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 17 12:24:12 2020 -0800 Syntax error due to long integer syntax Python 3 no longer has a separate type for long integers (all numbers are covered by ints). This fixes... Traceback (most recent call last): File "/usr/local/lib/python3.5/dist-packages/twisted/trial/runner.py", line 823, in loadByName return self.suiteFactory([self.findByName(name, recurse=recurse)]) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/runner.py", line 702, in findByName __import__(name) builtins.SyntaxError: invalid syntax (test_bridgerequest.py, line 51) Test results changed as follows... before: FAILED (skips=114, failures=14, errors=158, successes=695) after: FAILED (skips=114, failures=14, errors=157, successes=700) --- bridgedb/test/test_bridgerequest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridgedb/test/test_bridgerequest.py b/bridgedb/test/test_bridgerequest.py index 681d54a..80b5534 100644 --- a/bridgedb/test/test_bridgerequest.py +++ b/bridgedb/test/test_bridgerequest.py @@ -48,11 +48,11 @@ class BridgeRequestBaseTests(unittest.TestCase): should use the default client identifier string. """ self.assertEqual(self.request.getHashringPlacement('AAAA'), - 3486762050L) + 3486762050) def test_BridgeRequestBase_getHashringPlacement_with_client(self): """BridgeRequestBase.getHashringPlacement() with a client parameter should use the client identifier string. """ self.assertEqual(self.request.getHashringPlacement('AAAA', client='you'), - 2870307088L) + 2870307088)

1 0

[bridgedb/develop] Replace has_key method call
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit adc0f16639e9f61c06c7d0d49c51199c115488c6 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 17 13:18:18 2020 -0800 Replace has_key method call Python's has_key method was always pointless since "x in my_dict" does the same. The method was removed in python 3 so this fixes... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_https_distributor.py", line 255, in test_HTTPSDistributor_getBridges_with_varied_blocked_bridges bridge.setBlockedIn('cn', methodname='vanilla') File "/home/atagar/Desktop/tor/bridgedb/bridgedb/bridges.py", line 1501, in setBlockedIn self._addBlockByKey(key, countryCode) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/bridges.py", line 1381, in _addBlockByKey if self._blockedIn.has_key(key): builtins.AttributeError: 'dict' object has no attribute 'has_key' Test results changed as follows... before: FAILED (skips=114, failures=15, errors=140, successes=716) after: FAILED (skips=114, failures=15, errors=133, successes=723) --- bridgedb/bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/bridges.py b/bridgedb/bridges.py index 827a156..cdd1ae8 100644 --- a/bridgedb/bridges.py +++ b/bridgedb/bridges.py @@ -1377,7 +1377,7 @@ class Bridge(BridgeBackwardsCompatibility): :meth:`_getBlockKey`. :param str countryCode: A two-character country code specifier. """ - if self._blockedIn.has_key(key): + if key in self._blockedIn: self._blockedIn[key].append(countryCode.lower()) else: self._blockedIn[key] = [countryCode.lower(),]

1 0

[bridgedb/develop] Fix metric test
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 6844a56c81b05a70ef6ba2a1c8ec3acd663e6340 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 17 14:29:52 2020 -0800 Fix metric test Just the normal unicode/byte issue. This fixes... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_metrics.py", line 164, in test_email_metrics email_metrix.recordValidEmailRequest(responder) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/metrics.py", line 411, in recordValidEmailRequest self._recordEmailRequest(smtpAutoresp, True) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/metrics.py", line 403, in _recordEmailRequest sld = emailAddr.domain.split(".")[0] builtins.TypeError: a bytes-like object is required, not 'str' Test results mostly unchanged... before: FAILED (skips=114, failures=15, errors=109, successes=747) after: FAILED (skips=114, failures=16, errors=108, successes=747) --- bridgedb/metrics.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bridgedb/metrics.py b/bridgedb/metrics.py index 2785874..bb888d9 100644 --- a/bridgedb/metrics.py +++ b/bridgedb/metrics.py @@ -279,6 +279,9 @@ class Metrics(metaclass=Singleton): combinations. """ + if isinstance(countryOrProvider, bytes): + countryOrProvider = countryOrProvider.decode('utf-8') + countryOrProvider = countryOrProvider.lower() bridgeType = bridgeType.lower() success = "success" if success else "fail" @@ -400,7 +403,7 @@ class EmailMetrics(Metrics): logging.debug("Recording %svalid email request for %s from %s." % ("" if success else "in", bridgeType, emailAddr)) - sld = emailAddr.domain.split(".")[0] + sld = emailAddr.domain.split(b".")[0] # Now update our metrics. key = self.createKey(self.keyPrefix, bridgeType, sld, success,

1 0

[bridgedb/develop] Fix debug hexify statement
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 442e38c2cd5f077592aa9fea19d8a62276b14f3f Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 17 13:22:46 2020 -0800 Fix debug hexify statement Oops, missed that there was other instances of hex conversion... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_https_distributor.py", line 235, in test_HTTPSDistributor_getBridges_with_some_blocked_bridges bridges = dist.getBridges(clientRequest1, 1) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/distributors/https/distributor.py", line 327, in getBridges logging.debug("Assigned client to subhashring position: %s" % position.encode('hex')) builtins.AttributeError: 'bytes' object has no attribute 'encode' Test results changed as follows... before: FAILED (skips=114, failures=15, errors=133, successes=723) after: FAILED (skips=114, failures=15, errors=122, successes=734) --- bridgedb/Bridges.py | 3 ++- bridgedb/distributors/https/distributor.py | 3 ++- bridgedb/test/test_crypto.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index 135174c..46b7afe 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -10,6 +10,7 @@ them into hashrings for distributors. """ +import binascii import bisect import logging import re @@ -329,7 +330,7 @@ class BridgeRing(object): else: logging.debug( "Got duplicate bridge %r in main hashring for position %r." - % (logSafely(k.encode('hex')), pos.encode('hex'))) + % (logSafely(binascii.hexlify(k).decode('utf-8')), binascii.hexlify(pos).decode('utf-8'))) keys.sort() if filterBySubnet: diff --git a/bridgedb/distributors/https/distributor.py b/bridgedb/distributors/https/distributor.py index 03aa970..f3e2e9b 100644 --- a/bridgedb/distributors/https/distributor.py +++ b/bridgedb/distributors/https/distributor.py @@ -20,6 +20,7 @@ A Distributor that hands out bridges through a web interface. :parts: 1 """ +import binascii import ipaddr import logging @@ -324,7 +325,7 @@ class HTTPSDistributor(Distributor): logging.debug("Client request within time interval: %s" % interval) logging.debug("Assigned client to subhashring %d/%d" % (subring, self.totalSubrings)) - logging.debug("Assigned client to subhashring position: %s" % position.encode('hex')) + logging.debug("Assigned client to subhashring position: %s" % binascii.hexlify(position).decode('utf-8')) logging.debug("Total bridges: %d" % len(self.hashring)) logging.debug("Bridge filters: %s" % ' '.join([x.__name__ for x in filters])) diff --git a/bridgedb/test/test_crypto.py b/bridgedb/test/test_crypto.py index 000ca0f..9255c30 100644 --- a/bridgedb/test/test_crypto.py +++ b/bridgedb/test/test_crypto.py @@ -15,6 +15,7 @@ from __future__ import print_function from __future__ import unicode_literals import base64 +import binascii import io import logging import math @@ -87,7 +88,7 @@ class GetKeyTests(unittest.TestCase): """The example key and the one read from file differ! key (in hex): %s SEKRIT_KEY (in hex): %s""" - % (key.encode('hex'), SEKRIT_KEY.encode('hex'))) + % (binascii.hexlify(key).decode('utf-8'), binascii.hexlify(SEKRIT_KEY).decode('utf-8'))) class InitializeGnuPGTests(unittest.TestCase):

1 0

[bridgedb/develop] Replace func_name method
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 1a1cc3fbd56ce4f6ef05eb82226b49745221c4cf Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 17 13:14:54 2020 -0800 Replace func_name method This fixes... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_https_distributor.py", line 154, in test_HTTPSDistributor_prepopulateRings_without_proxies dist.prepopulateRings() File "/home/atagar/Desktop/tor/bridgedb/bridgedb/distributors/https/distributor.py", line 263, in prepopulateRings populate_from=self.hashring.bridges) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/Bridges.py", line 673, in addRing filterNames = self.extractFilterNames(ringname) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/Bridges.py", line 630, in extractFilterNames for filterName in [x.func_name for x in list(ringname)]: File "/home/atagar/Desktop/tor/bridgedb/bridgedb/Bridges.py", line 630, in <listcomp> for filterName in [x.func_name for x in list(ringname)]: builtins.AttributeError: 'function' object has no attribute 'func_name' Test results changed as follows... before: FAILED (skips=114, failures=14, errors=143, successes=714) after: FAILED (skips=114, failures=15, errors=140, successes=716) --- bridgedb/Bridges.py | 4 ++-- bridgedb/distributors/https/distributor.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index 20a78cb..135174c 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -627,8 +627,8 @@ class FilteredBridgeSplitter(object): """ filterNames = [] - for filterName in [x.func_name for x in list(ringname)]: - # Using `assignBridgesToSubring.func_name` gives us a messy + for filterName in [x.__name__ for x in list(ringname)]: + # Using `assignBridgesToSubring.__name__` gives us a messy # string which includes all parameters and memory addresses. Get # rid of this by partitioning at the first `(`: realFilterName = filterName.partition('(')[0] diff --git a/bridgedb/distributors/https/distributor.py b/bridgedb/distributors/https/distributor.py index 7bce8d9..03aa970 100644 --- a/bridgedb/distributors/https/distributor.py +++ b/bridgedb/distributors/https/distributor.py @@ -326,7 +326,7 @@ class HTTPSDistributor(Distributor): logging.debug("Assigned client to subhashring %d/%d" % (subring, self.totalSubrings)) logging.debug("Assigned client to subhashring position: %s" % position.encode('hex')) logging.debug("Total bridges: %d" % len(self.hashring)) - logging.debug("Bridge filters: %s" % ' '.join([x.func_name for x in filters])) + logging.debug("Bridge filters: %s" % ' '.join([x.__name__ for x in filters])) # Check wheth we have a cached copy of the hashring: if filters in self.hashring.filterRings.keys():

1 0

[bridgedb/develop] None type cannot be compared to integers
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit e71c76a87ff509ea2d19ffaec06ae6e7d8a7a7c7 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 17 13:40:11 2020 -0800 None type cannot be compared to integers Python changed its behavior with regard to how integers are compared with None... Python 2: >>> bool(not None > 0) True Python3: >>> bool(not None > 0) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: unorderable types: NoneType() > int() This fixes... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_schedule.py", line 110, in test_ScheduledInterval_init_noargs sched = self.sched() File "/home/atagar/Desktop/tor/bridgedb/bridgedb/schedule.py", line 187, in __init__ self._setIntervalCount(count) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/schedule.py", line 208, in _setIntervalCount % (self.__class__.__name__, count)) bridgedb.schedule.UnknownInterval: ScheduledInterval.intervalCount: None ist not an integer. Test results changed as follows... before: FAILED (skips=114, failures=15, errors=117, successes=739) after: FAILED (skips=114, failures=15, errors=116, successes=740) --- bridgedb/schedule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/schedule.py b/bridgedb/schedule.py index e962c39..8a7ca0f 100644 --- a/bridgedb/schedule.py +++ b/bridgedb/schedule.py @@ -200,7 +200,7 @@ class ScheduledInterval(Unscheduled): :raises UnknownInterval: if the specified **count** was invalid. """ try: - if not count > 0: + if count is None or not count > 0: count = 1 count = int(count) except (TypeError, ValueError):

1 0

[bridgedb/develop] Replace dict's iteritems with items
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit a7bb3fbab43ca01455e283d29a3f68cbb9a0a2fe Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 17 13:58:14 2020 -0800 Replace dict's iteritems with items Python's methods for keys, values, and items now provide iterators so there is no longer a separate iteritems method. This fixes... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_metrics.py", line 108, in test_export metrics.export(pseudo_fh, 0) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/metrics.py", line 131, in export httpsLines = httpsMetrix.getMetrics() File "/home/atagar/Desktop/tor/bridgedb/bridgedb/metrics.py", line 235, in getMetrics for key, value in self.coldMetrics.iteritems(): builtins.AttributeError: 'dict' object has no attribute 'iteritems' This changes test results as follows... before: FAILED (skips=114, failures=15, errors=111, successes=745) after: FAILED (skips=114, failures=15, errors=109, successes=747) --- bridgedb/Bridges.py | 2 +- bridgedb/metrics.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index 46b7afe..93d0190 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -539,7 +539,7 @@ class BridgeSplitter(object): logging.info("Current rings: %s" % " ".join(self.ringsByName)) def dumpAssignments(self, f, description=""): - for name,ring in self.ringsByName.iteritems(): + for name,ring in self.ringsByName.items(): ring.dumpAssignments(f, "%s %s" % (description, name)) diff --git a/bridgedb/metrics.py b/bridgedb/metrics.py index 5d8bda3..2785874 100644 --- a/bridgedb/metrics.py +++ b/bridgedb/metrics.py @@ -232,7 +232,7 @@ class Metrics(metaclass=Singleton): :returns: A list of metric lines. """ lines = [] - for key, value in self.coldMetrics.iteritems(): + for key, value in self.coldMetrics.items(): # Round up our value to the nearest multiple of self.binSize to # reduce the accuracy of our real values. if (value % self.binSize) > 0:

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2020