tor-commits February 2020

tor-commits@lists.torproject.org

22 participants
1454 discussions

[bridgedb/master] Merge branch 'defect/30946' into develop
by phw＠torproject.org 19 Feb '20

19 Feb '20

1 0

[bridgedb/master] Update documented return value.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 1f614896ed3442c8758e7ea10bef0c1fc366a4c1 Author: Philipp Winter <phw(a)nymity.ch> Date: Fri Feb 14 10:07:47 2020 -0800 Update documented return value. The function is returning a bytes, and not a str. --- bridgedb/qrcodes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridgedb/qrcodes.py b/bridgedb/qrcodes.py index 6030a42..3cb3a89 100644 --- a/bridgedb/qrcodes.py +++ b/bridgedb/qrcodes.py @@ -33,8 +33,8 @@ def generateQR(bridgelines, imageFormat='JPEG', bridgeSchema=False): client. :param bool bridgeSchema: If ``True``, prepend ``'bridge://'`` to the beginning of each bridge line before QR encoding. - :rtype: str or ``None`` - :returns: The generated QRCode, as a string. + :rtype: bytes or ``None`` + :returns: The generated QRCode, as a bytes. """ logging.debug("Attempting to encode bridge lines into a QRCode...")

1 0

[bridgedb/master] Bump version number to 0.9.4.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit e461a7a0477a31e11ac89cc3161cbf24a4bea9e7 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Feb 19 10:09:06 2020 -0800 Bump version number to 0.9.4. --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 6d4c402..163fc6c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +Changes in version 0.9.4 - 2020-02-19 + * FIXES https://bugs.torproject.org/30946 This patch ports BridgeDB to Python 3. Python 2 is no longer supported since Jan 1, 2020.

1 0

[bridgedb/master] Fix remaining str/bytes issues in moat server.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 468dfa0fc5e13da9ba384f9bcb6e7e11bfc26482 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Feb 13 15:05:24 2020 -0800 Fix remaining str/bytes issues in moat server. We ran into these issues while test-deploying the Python 3 branch on polyanthum. --- bridgedb/distributors/moat/server.py | 16 ++++++++-------- bridgedb/test/test_distributors_moat_server.py | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bridgedb/distributors/moat/server.py b/bridgedb/distributors/moat/server.py index e49a6bb..cdf2022 100644 --- a/bridgedb/distributors/moat/server.py +++ b/bridgedb/distributors/moat/server.py @@ -178,11 +178,11 @@ class JsonAPIResource(resource.Resource): :param request: A ``Request`` for a :api:`twisted.web.resource.Resource`. :returns: The encoded data. """ - request.responseHeaders.addRawHeader(b"Content-Type", b"application/vnd.api+json") - request.responseHeaders.addRawHeader(b"Server", b"moat/%s" % MOAT_API_VERSION.encode('utf-8')) + request.responseHeaders.addRawHeader("Content-Type", "application/vnd.api+json") + request.responseHeaders.addRawHeader("Server", "moat/%s" % MOAT_API_VERSION) if data: - rendered = json.dumps(data) + rendered = json.dumps(data).encode("utf-8") else: rendered = b"" @@ -824,13 +824,13 @@ def addMoatServer(config, distributor): hmacKey, publicKey, secretKey, fwdHeaders, skipLoopback) - moat.putChild("fetch", fetch) - moat.putChild("check", check) - meek.putChild("moat", moat) + moat.putChild(b"fetch", fetch) + moat.putChild(b"check", check) + meek.putChild(b"moat", moat) root = CustomErrorHandlingResource() - root.putChild("meek", meek) - root.putChild("moat", moat) + root.putChild(b"meek", meek) + root.putChild(b"moat", moat) site = Site(root) site.displayTracebacks = False diff --git a/bridgedb/test/test_distributors_moat_server.py b/bridgedb/test/test_distributors_moat_server.py index 222518d..695116b 100644 --- a/bridgedb/test/test_distributors_moat_server.py +++ b/bridgedb/test/test_distributors_moat_server.py @@ -884,7 +884,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): response = self.resource.failureResponse(6, request, bridgeRequest) - self.assertIn("No bridges available", response) + self.assertIn(b"No bridges available", response) def test_render_POST_no_bridges(self): self.mock_getBridgeLines() @@ -892,7 +892,7 @@ class CaptchaCheckResourceTests(unittest.TestCase): request = self.create_valid_POST_make_new_challenge() response = self.resource.render(request) - self.assertIn("No bridges available", response) + self.assertIn(b"No bridges available", response) def test_render_POST_unexpired(self): request = self.create_valid_POST_make_new_challenge()

1 0

[bridgedb/master] Merge branch 'release-0.9.4'
by phw＠torproject.org 19 Feb '20

19 Feb '20

1 0

[bridgedb/master] Replace assertItemsEqual with assertCountEqual
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 66c0f8bd9356a8e6387557cbee284aa011bb606c Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 13:47:19 2020 -0800 Replace assertItemsEqual with assertCountEqual I really dislike the new method name, but cest la vi. According to the following they're the same... https://docs.python.org/2/library/unittest.html#unittest.TestCase.assertIte… This changes the test results as follows... before: FAILED (skips=1, failures=8, errors=53, successes=250) after: FAILED (skips=1, failures=8, errors=49, successes=254) --- bridgedb/test/test_bridges.py | 64 ++++++++++++------------- bridgedb/test/test_distributors_moat_request.py | 2 +- bridgedb/test/test_distributors_moat_server.py | 4 +- bridgedb/test/test_https_distributor.py | 2 +- bridgedb/test/test_https_request.py | 2 +- bridgedb/test/test_main.py | 2 +- bridgedb/test/test_persistentSaveAndLoad.py | 3 +- bridgedb/test/test_proxy.py | 12 ++--- 8 files changed, 45 insertions(+), 46 deletions(-) diff --git a/bridgedb/test/test_bridges.py b/bridgedb/test/test_bridges.py index cc1680e..f2c2876 100644 --- a/bridgedb/test/test_bridges.py +++ b/bridgedb/test/test_bridges.py @@ -506,7 +506,7 @@ class PluggableTransportTests(unittest.TestCase): args = pt._parseArgumentsIntoDict(["sharedsecret=foobar", "publickey=1234"]) self.assertIsInstance(args, dict) - self.assertItemsEqual(args, {"sharedsecret": "foobar", + self.assertCountEqual(args, {"sharedsecret": "foobar", "publickey": "1234"}) def test_PluggableTransport_parseArgumentsIntoDict_valid_list_multi(self): @@ -517,7 +517,7 @@ class PluggableTransportTests(unittest.TestCase): args = pt._parseArgumentsIntoDict(["sharedsecret=foobar,password=baz", "publickey=1234"]) self.assertIsInstance(args, dict) - self.assertItemsEqual(args, {"sharedsecret": "foobar", + self.assertCountEqual(args, {"sharedsecret": "foobar", "password": "baz", "publickey": "1234"}) @@ -528,7 +528,7 @@ class PluggableTransportTests(unittest.TestCase): pt = bridges.PluggableTransport() args = pt._parseArgumentsIntoDict( ["sharedsecret=foobar,password,publickey=1234"]) - self.assertItemsEqual(args, {"sharedsecret": "foobar", + self.assertCountEqual(args, {"sharedsecret": "foobar", "publickey": "1234"}) def test_PluggableTransport_checkArguments_scramblesuit_missing_password(self): @@ -1013,11 +1013,11 @@ class BridgeTests(unittest.TestCase): """ self.bridge.address = '1.1.1.1' self.bridge.orPort = 443 - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) def test_Bridge_allVanillaAddresses_idempotency_others(self): @@ -1027,17 +1027,17 @@ class BridgeTests(unittest.TestCase): """ self.bridge.address = '1.1.1.1' self.bridge.orPort = 443 - self.assertItemsEqual(self.bridge.orAddresses, []) - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.orAddresses, []) + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) - self.assertItemsEqual(self.bridge.orAddresses, []) - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.orAddresses, []) + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) - self.assertItemsEqual(self.bridge.orAddresses, []) + self.assertCountEqual(self.bridge.orAddresses, []) def test_Bridge_allVanillaAddresses_reentrancy_all(self): """Bridge.allVanillaAddresses should be reentrant, i.e. updating the @@ -1045,34 +1045,34 @@ class BridgeTests(unittest.TestCase): returned by allVanillaAddresses. """ self.bridge.address = '1.1.1.1' - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), None, 4)]) self.assertEqual(self.bridge.address, ipaddr.IPv4Address('1.1.1.1')) self.assertEqual(self.bridge.orPort, None) - self.assertItemsEqual(self.bridge.orAddresses, []) + self.assertCountEqual(self.bridge.orAddresses, []) self.bridge.orPort = 443 - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) self.assertEqual(self.bridge.address, ipaddr.IPv4Address('1.1.1.1')) self.assertEqual(self.bridge.orPort, 443) - self.assertItemsEqual(self.bridge.orAddresses, []) + self.assertCountEqual(self.bridge.orAddresses, []) self.bridge.address = '2.2.2.2' - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('2.2.2.2'), 443, 4)]) self.assertEqual(self.bridge.address, ipaddr.IPv4Address('2.2.2.2')) self.assertEqual(self.bridge.orPort, 443) - self.assertItemsEqual(self.bridge.orAddresses, []) + self.assertCountEqual(self.bridge.orAddresses, []) self.bridge.orAddresses.append( (ipaddr.IPv6Address('200::6ffb:11bb:a129'), 4443, 6)) - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('2.2.2.2'), 443, 4), (ipaddr.IPv6Address('200::6ffb:11bb:a129'), 4443, 6)]) self.assertEqual(self.bridge.address, ipaddr.IPv4Address('2.2.2.2')) self.assertEqual(self.bridge.orPort, 443) - self.assertItemsEqual(self.bridge.orAddresses, + self.assertCountEqual(self.bridge.orAddresses, [(ipaddr.IPv6Address('200::6ffb:11bb:a129'), 4443, 6)]) def test_Bridge_allVanillaAddresses_reentrancy_orPort(self): @@ -1081,15 +1081,15 @@ class BridgeTests(unittest.TestCase): set, it should return the orPort. """ self.bridge.address = '1.1.1.1' - self.assertItemsEqual(self.bridge.orAddresses, []) - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.orAddresses, []) + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), None, 4)]) - self.assertItemsEqual(self.bridge.orAddresses, []) + self.assertCountEqual(self.bridge.orAddresses, []) self.bridge.orPort = 443 - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) - self.assertItemsEqual(self.bridge.orAddresses, []) + self.assertCountEqual(self.bridge.orAddresses, []) def test_Bridge_allVanillaAddresses_reentrancy_address(self): """Calling Bridge.allVanillaAddresses before Bridge.address is set @@ -1097,10 +1097,10 @@ class BridgeTests(unittest.TestCase): is set, it should return the address. """ self.bridge.orPort = 443 - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(None, 443, 4)]) self.bridge.address = '1.1.1.1' - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) def test_Bridge_allVanillaAddresses_reentrancy_orAddresses(self): @@ -1109,14 +1109,14 @@ class BridgeTests(unittest.TestCase): """ self.bridge.address = '1.1.1.1' self.bridge.orPort = 443 - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) - self.assertItemsEqual(self.bridge.orAddresses, []) + self.assertCountEqual(self.bridge.orAddresses, []) self.bridge.orAddresses.append( (ipaddr.IPv4Address('2.2.2.2'), 4443, 4)) - self.assertItemsEqual(self.bridge.orAddresses, + self.assertCountEqual(self.bridge.orAddresses, [(ipaddr.IPv4Address('2.2.2.2'), 4443, 4)]) - self.assertItemsEqual(self.bridge.allVanillaAddresses, + self.assertCountEqual(self.bridge.allVanillaAddresses, [(ipaddr.IPv4Address('2.2.2.2'), 4443, 4), (ipaddr.IPv4Address('1.1.1.1'), 443, 4)]) diff --git a/bridgedb/test/test_distributors_moat_request.py b/bridgedb/test/test_distributors_moat_request.py index 555b3eb..a5c22e0 100644 --- a/bridgedb/test/test_distributors_moat_request.py +++ b/bridgedb/test/test_distributors_moat_request.py @@ -30,7 +30,7 @@ class MoatBridgeRequest(unittest.TestCase): self.bridgeRequest.withoutBlockInCountry(data) self.bridgeRequest.generateFilters() - self.assertItemsEqual(['byTransportNotBlockedIn(vanilla,us,4)', + self.assertCountEqual(['byTransportNotBlockedIn(vanilla,us,4)', 'byTransportNotBlockedIn(vanilla,ir,4)', 'byTransportNotBlockedIn(vanilla,sy,4)', 'byProbingResistance(vanilla,4)'], diff --git a/bridgedb/test/test_distributors_moat_server.py b/bridgedb/test/test_distributors_moat_server.py index 33069ef..222518d 100644 --- a/bridgedb/test/test_distributors_moat_server.py +++ b/bridgedb/test/test_distributors_moat_server.py @@ -140,7 +140,7 @@ class MiscellaneousTests(unittest.TestCase): """ server.setSupportedTransports(self.config.SUPPORTED_TRANSPORTS) - self.assertItemsEqual(server.getSupportedTransports(), + self.assertCountEqual(server.getSupportedTransports(), ["obfs4", "obfs3", "scramblesuit", "fte", "vanilla"]) @@ -553,7 +553,7 @@ class CaptchaFetchResourceTests(unittest.TestCase): def test_getPreferredTransports_unknown_transport(self): preferred = self.resource.getPreferredTransports(['dinosaur']) - self.assertItemsEqual(preferred, + self.assertCountEqual(preferred, ['obfs4', 'obfs3', 'fte', 'scramblesuit', 'vanilla']) def assert_data_is_ok(self, decoded): diff --git a/bridgedb/test/test_https_distributor.py b/bridgedb/test/test_https_distributor.py index dd56785..a96238d 100644 --- a/bridgedb/test/test_https_distributor.py +++ b/bridgedb/test/test_https_distributor.py @@ -322,7 +322,7 @@ class HTTPSDistributorTests(unittest.TestCase): for i in range(5): responses[i] = dist.getBridges(bridgeRequest, 1) for i in range(4): - self.assertItemsEqual(responses[i], responses[i+1]) + self.assertCountEqual(responses[i], responses[i+1]) def test_HTTPSDistributor_getBridges_with_BridgeRingParameters(self): param = BridgeRingParameters(needPorts=[(443, 1)]) diff --git a/bridgedb/test/test_https_request.py b/bridgedb/test/test_https_request.py index 2ea3fe6..81f8e0b 100644 --- a/bridgedb/test/test_https_request.py +++ b/bridgedb/test/test_https_request.py @@ -64,7 +64,7 @@ class HTTPSBridgeRequestTests(unittest.TestCase): self.request = request.HTTPSBridgeRequest(addClientCountryCode=False) self.request.client = '5.5.5.5' self.request.withoutBlockInCountry(httprequest) - self.assertItemsEqual(['nl'], self.request.notBlockedIn) + self.assertCountEqual(['nl'], self.request.notBlockedIn) def test_HTTPSBridgeRequest_withoutBlockInCountry_bad_params(self): """HTTPSBridgeRequest.withoutBlockInCountry() should stop processing if diff --git a/bridgedb/test/test_main.py b/bridgedb/test/test_main.py index 52d98a2..87b4a81 100644 --- a/bridgedb/test/test_main.py +++ b/bridgedb/test/test_main.py @@ -323,7 +323,7 @@ class BridgedbTests(unittest.TestCase): # a MoatDistributor ring, and an UnallocatedHolder ring: self.assertEqual(len(hashring.ringsByName.keys()), 4) self.assertGreater(len(httpsDist.proxies), 0) - self.assertItemsEqual(exitRelays, httpsDist.proxies) + self.assertCountEqual(exitRelays, httpsDist.proxies) def test_main_createBridgeRings_no_https_dist(self): """When HTTPS_DIST=False, main.createBridgeRings() should add only diff --git a/bridgedb/test/test_persistentSaveAndLoad.py b/bridgedb/test/test_persistentSaveAndLoad.py index 7678948..0ebb1e2 100644 --- a/bridgedb/test/test_persistentSaveAndLoad.py +++ b/bridgedb/test/test_persistentSaveAndLoad.py @@ -57,8 +57,7 @@ class StateSaveAndLoadTests(unittest.TestCase): self.assertIsInstance(loadedState, persistent.State) self.assertNotIdentical(self.state, loadedState) self.assertNotEqual(self.state, loadedState) - # For some reason, twisted.trial.unittest.TestCase in Python2.6 - # doesn't have an 'assertItemsEqual' attribute... + self.assertEqual(self.state.__dict__.keys().sort(), loadedState.__dict__.keys().sort()) diff --git a/bridgedb/test/test_proxy.py b/bridgedb/test/test_proxy.py index c55e03c..74290bc 100644 --- a/bridgedb/test/test_proxy.py +++ b/bridgedb/test/test_proxy.py @@ -254,7 +254,7 @@ class ProxySetUnittests(unittest.TestCase): def test_ProxySet_proxies_getter(self): """ProxySet.proxies should list all proxies.""" - self.assertItemsEqual(self.proxyList.proxies, set(self.proxies)) + self.assertCountEqual(self.proxyList.proxies, set(self.proxies)) def test_ProxySet_proxies_setter(self): """``ProxySet.proxies = ['foo']`` should raise an ``AttributeError``.""" @@ -273,7 +273,7 @@ class ProxySetUnittests(unittest.TestCase): def test_ProxySet_exitRelays_getter(self): """ProxySet.exitRelays should list all exit relays.""" self.proxyList.addExitRelays(self.moarProxies) - self.assertItemsEqual(self.proxyList.exitRelays, set(self.moarProxies)) + self.assertCountEqual(self.proxyList.exitRelays, set(self.moarProxies)) def test_ProxySet_exitRelays_setter(self): """``ProxySet.exitRelays = ['foo']`` should raise an ``AttributeError``.""" @@ -447,9 +447,9 @@ class ProxySetUnittests(unittest.TestCase): """ proxySetA = self.proxyList proxySetB = proxy.ProxySet(self.moarProxies) - self.assertItemsEqual(proxySetA.difference(proxySetB), + self.assertCountEqual(proxySetA.difference(proxySetB), set(self.proxies)) - self.assertItemsEqual(proxySetB.difference(proxySetA), + self.assertCountEqual(proxySetB.difference(proxySetA), set(self.moarProxies)) def test_ProxySet_firstSeen_returns_timestamp(self): @@ -493,7 +493,7 @@ class ProxySetUnittests(unittest.TestCase): a.extend(self.moarProxies) a = set(a) b = self.proxyList.intersection(set(self.moarProxies)) - self.assertItemsEqual(a, b) + self.assertCountEqual(a, b) def test_ProxySet_remove(self): """ProxySet.remove() should subtract proxies which were already added @@ -534,7 +534,7 @@ class ProxySetUnittests(unittest.TestCase): proxyListA = proxy.ProxySet(self.proxies) proxyListB = proxy.ProxySet(self.proxies) self.assertEqual(proxyListA, proxyListB) - self.assertItemsEqual(proxyListA, proxyListB) + self.assertCountEqual(proxyListA, proxyListB) self.assertEqual(hash(proxyListA), hash(proxyListB))

1 0

[bridgedb/master] Replace usage of StringIO
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 5c4c8112eec99bd253dd934c167244bf13c99cec Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 13:19:17 2020 -0800 Replace usage of StringIO Python 2.x had three copies of StringIO: * StringIO.StringIO => Original iirc, and long ago deprecated. * cStringIO.StringIO => More efficient, but also deprecated. * io.StringIO => Latest copy and the only present in python 3.x. This fixes a few stacktraces like the following... 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 "./bridgedb/test/test_metrics.py", line 18, in <module> import StringIO builtins.ImportError: No module named 'StringIO' This changes the test outcome as follows... before: FAILED (skips=1, failures=6, errors=54, successes=246) after: FAILED (skips=1, failures=8, errors=53, successes=250) --- bridgedb/Bridges.py | 6 ------ bridgedb/qrcodes.py | 4 ++-- bridgedb/test/test_metrics.py | 4 ++-- bridgedb/test/test_persistent.py | 4 ++-- bridgedb/test/test_persistentSaveAndLoad.py | 4 ++-- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index f80f4cd..7ec60e6 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -28,12 +28,6 @@ from bridgedb.parse.fingerprint import isValidFingerprint from bridgedb.parse.fingerprint import toHex from bridgedb.safelog import logSafely -try: - from cStringIO import StringIO -except ImportError: - from io import StringIO - - ID_LEN = 20 # XXX Only used in commented out line in Storage.py DIGEST_LEN = 20 PORTSPEC_LEN = 16 diff --git a/bridgedb/qrcodes.py b/bridgedb/qrcodes.py index b3c4546..80e82c8 100644 --- a/bridgedb/qrcodes.py +++ b/bridgedb/qrcodes.py @@ -13,7 +13,7 @@ """Utilities for working with QRCodes.""" -import cStringIO +import io import logging try: @@ -60,7 +60,7 @@ def generateQR(bridgelines, imageFormat=u'JPEG', bridgeSchema=False): qr = qrcode.QRCode() qr.add_data(bridgelines) - buf = cStringIO.StringIO() + buf = io.StringIO() img = qr.make_image().resize([350, 350]) img.save(buf, imageFormat) buf.seek(0) diff --git a/bridgedb/test/test_metrics.py b/bridgedb/test/test_metrics.py index ce0f63d..fcc9e4a 100644 --- a/bridgedb/test/test_metrics.py +++ b/bridgedb/test/test_metrics.py @@ -15,7 +15,7 @@ These tests are meant to ensure that the :mod:`bridgedb.metrics` module is functioning as expected. """ -import StringIO +import io import json import os @@ -104,7 +104,7 @@ class StateTest(unittest.TestCase): self.metrix.inc(self.key) self.metrix.coldMetrics = self.metrix.hotMetrics - pseudo_fh = StringIO.StringIO() + pseudo_fh = io.StringIO() metrics.export(pseudo_fh, 0) self.assertTrue(len(pseudo_fh.getvalue()) > 0) diff --git a/bridgedb/test/test_persistent.py b/bridgedb/test/test_persistent.py index 6547475..3ff6d87 100644 --- a/bridgedb/test/test_persistent.py +++ b/bridgedb/test/test_persistent.py @@ -17,10 +17,10 @@ functioning as expected. from __future__ import print_function +import io import os.path from copy import deepcopy -from io import StringIO from bridgedb import persistent from bridgedb.parse.options import MainOptions @@ -33,7 +33,7 @@ from sure import the from sure import expect -TEST_CONFIG_FILE = StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO(unicode("""\ BRIDGE_FILES = ['bridge-descriptors', 'bridge-descriptors.new'] LOGFILE = 'bridgedb.log'""")) diff --git a/bridgedb/test/test_persistentSaveAndLoad.py b/bridgedb/test/test_persistentSaveAndLoad.py index 18f601e..7678948 100644 --- a/bridgedb/test/test_persistentSaveAndLoad.py +++ b/bridgedb/test/test_persistentSaveAndLoad.py @@ -18,17 +18,17 @@ are all functioning as expected. This module should not import :mod:`sure`. """ +import io import os from copy import deepcopy -from io import StringIO from twisted.trial import unittest from bridgedb import persistent -TEST_CONFIG_FILE = StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO(unicode("""\ BRIDGE_FILES = ['bridge-descriptors', 'bridge-descriptors.new'] LOGFILE = 'bridgedb.log'"""))

1 0

[bridgedb/master] Replace usage of xrange
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 8d9ebc7b0e807618ae79951ea850396b4788b3d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 13:07:22 2020 -0800 Replace usage of xrange Python 2.x had two functios to get a numeric range... * range() returned a list of numbers * xrange() returned a generator of numbers The later was slightly more efficient for loops, so as a rule of thumb 99% of the time you wanted xrange(). Python 3.x only has a single range() function which uses xrange()'s behavior. If you want the old range()'s behavior (ie. to get a list) you do... my_list = list(range(from, to)) This fixes the following stacktraces... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_schedule.py", line 188, in test_ScheduledInterval_getInterval_minute self._check_getInterval(15, 'minutes', 15*60) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_schedule.py", line 171, in _check_getInterval [secs.append(0) for _ in xrange(6-len(secs))] builtins.NameError: name 'xrange' is not defined Test results change as follows: before: FAILED (skips=1, failures=3, errors=61, successes=242) after: FAILED (skips=1, failures=6, errors=54, successes=246) --- bridgedb/Bridges.py | 2 +- bridgedb/test/email_helpers.py | 4 ++-- bridgedb/test/legacy_Tests.py | 30 +++++++++++++++--------------- bridgedb/test/test_https_distributor.py | 8 ++++---- bridgedb/test/test_parse_addr.py | 4 ++-- bridgedb/test/test_schedule.py | 2 +- bridgedb/test/util.py | 8 ++++---- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index 3c94fdf..f80f4cd 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -405,7 +405,7 @@ class FixedBridgeSplitter(object): description is ``"IPv6 obfs2 bridges"`` the line would read: ``"IPv6 obfs2 bridges ring=3"``. """ - for index, ring in zip(xrange(len(self.rings)), self.rings): + for index, ring in zip(range(len(self.rings)), self.rings): ring.dumpAssignments(filename, "%s ring=%s" % (description, index)) diff --git a/bridgedb/test/email_helpers.py b/bridgedb/test/email_helpers.py index 645fc93..e149dd5 100644 --- a/bridgedb/test/email_helpers.py +++ b/bridgedb/test/email_helpers.py @@ -138,7 +138,7 @@ class DummyEmailDistributor(object): self.answerParameters = answerParameters def getBridges(self, bridgeRequest, epoch): - return [util.DummyBridge() for _ in xrange(self._bridgesPerResponseMin)] + return [util.DummyBridge() for _ in range(self._bridgesPerResponseMin)] def cleanDatabase(self): pass @@ -167,7 +167,7 @@ class DummyEmailDistributorWithState(DummyEmailDistributor): self.alreadySeen[bridgeRequest.client] += 1 if self.alreadySeen[bridgeRequest.client] <= 1: - return [util.DummyBridge() for _ in xrange(self._bridgesPerResponseMin)] + return [util.DummyBridge() for _ in range(self._bridgesPerResponseMin)] elif self.alreadySeen[bridgeRequest.client] == 2: raise TooSoonEmail( "Seen client '%s' %d times" diff --git a/bridgedb/test/legacy_Tests.py b/bridgedb/test/legacy_Tests.py index 00e1d12..37bce70 100644 --- a/bridgedb/test/legacy_Tests.py +++ b/bridgedb/test/legacy_Tests.py @@ -61,17 +61,17 @@ def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, transports=False): ip = randomIPv4() nn = "bridge-%s" % int(ip) - fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) + fp = "".join([random.choice("0123456789ABCDEF") for _ in range(40)]) b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) b.setStatus(running, stable) oraddrs = [] if or_addresses: - for i in xrange(8): + for i in range(8): b.orAddresses.append((randomValidIPv6(), randomPort(), 6)) if transports: - for i in xrange(0,8): + for i in range(0,8): b.transports.append(bridgedb.Bridges.PluggableTransport(b, random.choice(["obfs", "obfs2", "pt1"]), randomIP(), randomPort())) @@ -81,17 +81,17 @@ def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False, transports=False): ip = randomIPv6() nn = "bridge-%s" % int(ip) - fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) + fp = "".join([random.choice("0123456789ABCDEF") for _ in range(40)]) b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) b.setStatus(running, stable) oraddrs = [] if or_addresses: - for i in xrange(8): + for i in range(8): b.orAddresses.append((randomValidIPv6(), randomPort(), 6)) if transports: - for i in xrange(0,8): + for i in range(0,8): b.transports.append(bridgedb.Bridges.PluggableTransport(b, random.choice(["obfs", "obfs2", "pt1"]), randomIP(), randomPort())) @@ -226,7 +226,7 @@ class BridgeStabilityTests(unittest.TestCase): db = self.db b = random.choice([fakeBridge,fakeBridge6])() def timestampSeries(x): - for i in xrange(61): + for i in range(61): yield (i+1)*60*30 + x # 30 minute intervals now = time.time() time_on_address = long(60*30*60) # 30 hours @@ -244,17 +244,17 @@ class BridgeStabilityTests(unittest.TestCase): def testLastSeenWithDifferentAddressAndPort(self): db = self.db - for i in xrange(10): + for i in range(10): num_desc = 30 time_start = time.time() - ts = [ 60*30*(i+1) + time_start for i in xrange(num_desc) ] + ts = [ 60*30*(i+1) + time_start for i in range(num_desc) ] b = random.choice([fakeBridge(), fakeBridge6()]) [ bridgedb.Stability.addOrUpdateBridgeHistory(b, t) for t in ts ] # change the port b.orport = b.orport+1 last_seen = ts[-1] - ts = [ 60*30*(i+1) + last_seen for i in xrange(num_desc) ] + ts = [ 60*30*(i+1) + last_seen for i in range(num_desc) ] [ bridgedb.Stability.addOrUpdateBridgeHistory(b, t) for t in ts ] b = db.getBridgeHistory(b.fingerprint) assert b.tosa == ts[-1] - last_seen @@ -267,11 +267,11 @@ class BridgeStabilityTests(unittest.TestCase): num_bridges = 10 num_desc = 4*48 # 30m intervals, 48 per day time_start = time.time() - bridges = [ fakeBridge() for x in xrange(num_bridges) ] + bridges = [ fakeBridge() for x in range(num_bridges) ] t = time.time() - ts = [ (i+1)*60*30+t for i in xrange(num_bridges) ] + ts = [ (i+1)*60*30+t for i in range(num_bridges) ] for b in bridges: - time_series = [ 60*30*(i+1) + time_start for i in xrange(num_desc) ] + time_series = [ 60*30*(i+1) + time_start for i in range(num_desc) ] [ bridgedb.Stability.addOrUpdateBridgeHistory(b, i) for i in time_series ] assert None not in bridges # +1 to avoid rounding errors @@ -288,7 +288,7 @@ class BridgeStabilityTests(unittest.TestCase): num_bridges = 20 time_start = time.time() bridges = [random.choice([fakeBridge, fakeBridge6])() - for i in xrange(num_bridges)] + for i in range(num_bridges)] # run some of the bridges for the full time series running = bridges[:num_bridges/2] @@ -303,7 +303,7 @@ class BridgeStabilityTests(unittest.TestCase): # figure out how many intervals it will take for weightedUptime to # decay to < 1 num_desc = int(30*log(1/float(num_successful*30*60))/(-0.05)) - timeseries = [ 60*30*(i+1) + time_start for i in xrange(num_desc) ] + timeseries = [ 60*30*(i+1) + time_start for i in range(num_desc) ] for i in timeseries: for b in running: diff --git a/bridgedb/test/test_https_distributor.py b/bridgedb/test/test_https_distributor.py index c25c598..dd56785 100644 --- a/bridgedb/test/test_https_distributor.py +++ b/bridgedb/test/test_https_distributor.py @@ -261,7 +261,7 @@ class HTTPSDistributorTests(unittest.TestCase): [dist.insert(bridge) for bridge in bridges] - for i in xrange(5): + for i in range(5): bridgeRequest1 = self.randomClientRequestForNotBlockedIn('cn') bridgeRequest1.transports.append('obfs2') bridgeRequest1.generateFilters() @@ -335,7 +335,7 @@ class HTTPSDistributorTests(unittest.TestCase): [dist.insert(bridge) for bridge in bridges] [dist.insert(bridge) for bridge in self.bridges[:250]] - for _ in xrange(32): + for _ in range(32): bridgeRequest = self.randomClientRequest() answer = dist.getBridges(bridgeRequest, 1) count = 0 @@ -399,7 +399,7 @@ class HTTPSDistributorTests(unittest.TestCase): dist = distributor.HTTPSDistributor(3, self.key) [dist.insert(bridge) for bridge in self.bridges[:250]] - for i in xrange(500): + for i in range(500): bridgeRequest = self.randomClientRequest() bridgeRequest.withIPv6() bridgeRequest.generateFilters() @@ -421,7 +421,7 @@ class HTTPSDistributorTests(unittest.TestCase): dist = distributor.HTTPSDistributor(1, self.key) [dist.insert(bridge) for bridge in self.bridges[:250]] - for i in xrange(500): + for i in range(500): bridgeRequest = self.randomClientRequest() bridgeRequest.generateFilters() diff --git a/bridgedb/test/test_parse_addr.py b/bridgedb/test/test_parse_addr.py index 81e4508..124ea0f 100644 --- a/bridgedb/test/test_parse_addr.py +++ b/bridgedb/test/test_parse_addr.py @@ -669,7 +669,7 @@ class PortListTest(unittest.TestCase): ports. """ tooMany = addr.PortList.PORTSPEC_LEN + 1 - ports = [self.getRandomPort() for x in xrange(tooMany)] + ports = [self.getRandomPort() for x in range(tooMany)] log.msg("Testing addr.PortList(%s))" % ', '.join([type('')(port) for port in ports])) portList = addr.PortList(*ports) @@ -699,7 +699,7 @@ class PortListTest(unittest.TestCase): ports = (443, 9001, 9030) portList = addr.PortList(*ports) iterator = iter(portList) - for x in xrange(len(ports)): + for x in range(len(ports)): self.assertIn(iterator.next(), portList) def test_str(self): diff --git a/bridgedb/test/test_schedule.py b/bridgedb/test/test_schedule.py index 1bcec07..c95d6f9 100644 --- a/bridgedb/test/test_schedule.py +++ b/bridgedb/test/test_schedule.py @@ -168,7 +168,7 @@ class ScheduledIntervalTests(unittest.TestCase): ts = sched.getInterval(now) self.assertIsInstance(ts, str) secs = [int(x) for x in ts.replace('-', ' ').replace(':', ' ').split()] - [secs.append(0) for _ in xrange(6-len(secs))] + [secs.append(0) for _ in range(6-len(secs))] secs = schedule.calendar.timegm(secs) self.assertApproximates(now, secs, variance) diff --git a/bridgedb/test/util.py b/bridgedb/test/util.py index 9fc16b8..43219d5 100644 --- a/bridgedb/test/util.py +++ b/bridgedb/test/util.py @@ -135,7 +135,7 @@ def randomIPv6(): return ipaddr.IPv6Address(random.getrandbits(128)) def randomIP(): - if random.choice(xrange(2)): + if random.choice(range(2)): return randomIPv4() return randomIPv6() @@ -146,7 +146,7 @@ def randomIPv6String(): return bracketIPv6(randomIPv6().compressed) def randomIPString(): - if random.choice(xrange(2)): + if random.choice(range(2)): return randomIPv4String() return randomIPv6String() @@ -194,7 +194,7 @@ def generateFakeBridges(n=500): # Real tor currently only supports one extra ORAddress, and it can # only be IPv6. addrs = [(randomValidIPv6(), randomHighPort(), 6)] - fpr = "".join(random.choice('abcdef0123456789') for _ in xrange(40)) + fpr = "".join(random.choice('abcdef0123456789') for _ in range(40)) supported = ["obfs2", "obfs3", "fte"] transports = [] @@ -282,7 +282,7 @@ class DummyBridge(object): self.address = ipaddr.IPv4Address(ipv4) self.orPort = randomPort() self.fingerprint = "".join(random.choice('abcdef0123456789') - for _ in xrange(40)) + for _ in range(40)) self.orAddresses = [(randomIPv6(), randomPort(), 6)] def getBridgeLine(self, bridgeRequest, includeFingerprint=True):

1 0

[bridgedb/master] Merge branch 'master' into develop
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 7b142b899766dea9c503fa3bdf999421ee4b7f37 Merge: eb12be5 0f2349d Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Feb 18 16:15:44 2020 -0800 Merge branch 'master' into develop CHANGELOG | 2 ++ 1 file changed, 2 insertions(+)

1 0

[bridgedb/master] Replace basestring with str
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit cfd2b45e9525355ded12885f2a8d48899e3ba573 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 12:57:33 2020 -0800 Replace basestring with str Python 3.x does not have a basestring class... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_parse_addr.py", line 277, in test_isIPAddress_IP4DefaultRoute self.runTestForAddr(IP4DefaultRoute) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_parse_addr.py", line 225, in runTestForAddr result = addr.isIPAddress(testAddress) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/parse/addr.py", line 314, in isIPAddress if isValidIP(ip): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/parse/addr.py", line 410, in isValidIP if isinstance(ip, basestring): builtins.NameError: name 'basestring' is not defined Some replacement might *not* work. To be fully a drop-in replacement instead have... python 2: isisntance(msg, basestring) python 3: isinstance(msg, (str, bytes)) ... however, many of these code paths would break if they received a bytes rather than a unicode object. Porting to python 3.x requires that we play less fast and loose with byte/unicode typing so I'm going to presume 'bytes => str (unicode)' for our initial porting then fix required normalizations as we go along. Test outcome changes as follows... before: FAILED (failures=5, errors=138, successes=164) after: FAILED (skips=1, failures=3, errors=61, successes=242) --- bridgedb/distributors/email/autoresponder.py | 4 ++-- bridgedb/parse/addr.py | 12 ++++++------ bridgedb/persistent.py | 2 +- bridgedb/proxy.py | 18 +++++++++--------- bridgedb/test/test_bridges.py | 2 +- bridgedb/test/test_captcha.py | 10 +++++----- bridgedb/test/test_crypto.py | 6 +++--- bridgedb/test/test_geo.py | 4 ++-- bridgedb/test/test_parse_addr.py | 4 ++-- bridgedb/test/test_persistent.py | 8 ++++---- bridgedb/test/test_persistentSaveAndLoad.py | 4 ++-- bridgedb/test/test_proxy.py | 4 ++-- bridgedb/test/test_txrecaptcha.py | 2 +- bridgedb/test/test_util.py | 2 +- 14 files changed, 41 insertions(+), 41 deletions(-) diff --git a/bridgedb/distributors/email/autoresponder.py b/bridgedb/distributors/email/autoresponder.py index e69f78a..b00feeb 100644 --- a/bridgedb/distributors/email/autoresponder.py +++ b/bridgedb/distributors/email/autoresponder.py @@ -291,10 +291,10 @@ class EmailResponse(object): (i.e. ``'\\n'``). See :api:`twisted.mail.smtp.SMTPClient.getMailData` for the reason. - :type lines: :any:`basestring` or :any:`list` + :type lines: :any:`str` or :any:`list` :param lines: The lines to write to the :attr:`mailfile`. """ - if isinstance(lines, basestring): + if isinstance(lines, str): lines = lines.replace('\r\n', '\n') for ln in lines.split('\n'): self.write(ln) diff --git a/bridgedb/parse/addr.py b/bridgedb/parse/addr.py index 90bc1d5..334733d 100644 --- a/bridgedb/parse/addr.py +++ b/bridgedb/parse/addr.py @@ -297,7 +297,7 @@ def extractEmailAddress(emailaddr): def isIPAddress(ip, compressed=True): """Check if an arbitrary string is an IP address, and that it's valid. - :type ip: basestring or int + :type ip: str or int :param ip: The IP address to check. :param boolean compressed: If True, return a string representing the compressed form of the address. Otherwise, return an @@ -347,7 +347,7 @@ def isIPv4(ip): .. attention:: This does *not* check validity. See :func:`isValidIP`. - :type ip: basestring or int + :type ip: str or int :param ip: The IP address to check. :rtype: boolean :returns: True if the address is an IPv4 address. @@ -359,7 +359,7 @@ def isIPv6(ip): .. attention:: This does *not* check validity. See :func:`isValidIP`. - :type ip: basestring or int + :type ip: str or int :param ip: The IP address to check. :rtype: boolean :returns: True if the address is an IPv6 address. @@ -407,7 +407,7 @@ def isValidIP(ip): reasons = [] try: - if isinstance(ip, basestring): + if isinstance(ip, str): ip = ipaddr.IPAddress(ip) if ip.is_link_local: @@ -445,7 +445,7 @@ def isLoopback(ip): otherwise. """ try: - if isinstance(ip, basestring): + if isinstance(ip, str): ip = ipaddr.IPAddress(ip) if ip.is_loopback: @@ -572,7 +572,7 @@ class PortList(object): for arg in args: portlist = [] try: - if isinstance(arg, basestring): + if isinstance(arg, str): ports = set([int(p) for p in arg.split(',')][:self.PORTSPEC_LEN]) portlist.extend([self._sanitycheck(p) for p in ports]) diff --git a/bridgedb/persistent.py b/bridgedb/persistent.py index c46c4a5..4b077d8 100644 --- a/bridgedb/persistent.py +++ b/bridgedb/persistent.py @@ -173,7 +173,7 @@ class State(jelly.Jellyable): err = '' try: - if isinstance(statefile, basestring): + if isinstance(statefile, str): fh = open(statefile, 'r') elif not statefile.closed: fh = statefile diff --git a/bridgedb/proxy.py b/bridgedb/proxy.py index 6d93c48..fdb824d 100644 --- a/bridgedb/proxy.py +++ b/bridgedb/proxy.py @@ -161,7 +161,7 @@ class ProxySet(MutableSet): only added if it passes the checks in :func:`~bridgedb.parse.addr.isIPAddress`. - :type ip: basestring or int + :type ip: str or int :param ip: The IP address to add. :param tag: An optional value to link to **ip**. If not given, it will be a timestamp (seconds since epoch, as a float) for when **ip** @@ -183,7 +183,7 @@ class ProxySet(MutableSet): def __contains__(self, ip): """x.__contains__(y) <==> y in x. - :type ip: basestring or int + :type ip: str or int :param ip: The IP address to check. :rtype: boolean :returns: True if ``ip`` is in this set; False otherwise. @@ -196,7 +196,7 @@ class ProxySet(MutableSet): def __sub__(self, ip): """Entirely remove **ip** from this set. - :type ip: basestring or int + :type ip: str or int :param ip: The IP address to remove. """ try: @@ -244,7 +244,7 @@ class ProxySet(MutableSet): if len(x) == 2: self.add(x[0], x[1]) elif len(x) == 1: self.add(x, tag) else: raise ValueError(self._getErrorMessage(x, proxies)) - elif isinstance(x, (basestring, int)): + elif isinstance(x, (str, int)): self.add(x, tag) else: raise ValueError(self._getErrorMessage(x, proxies)) @@ -270,9 +270,9 @@ class ProxySet(MutableSet): def getTag(self, ip): """Get the tag for an **ip** in this ``ProxySet``, if available. - :type ip: basestring or int + :type ip: str or int :param ip: The IP address to obtain the tag for. - :rtype: ``None`` or basestring or int + :rtype: ``None`` or str or int :returns: The tag for that **ip**, iff **ip** exists in this ``ProxySet`` and it has a tag. """ @@ -281,7 +281,7 @@ class ProxySet(MutableSet): def getAllWithTag(self, tag): """Get all proxies in this ``ProxySet`` with a given tag. - :param basestring tag: A tag to search for. + :param str tag: A tag to search for. :rtype: set :returns: A set of all proxies which are contained within this :class:`~bridgedb.proxy.ProxySet` which are also tagged with @@ -293,7 +293,7 @@ class ProxySet(MutableSet): def firstSeen(self, ip): """Get the timestamp when **ip** was first seen, if available. - :type ip: basestring or int + :type ip: str or int :param ip: The IP address to obtain a timestamp for. :rtype: float or None :returns: The timestamp (in seconds since epoch) if available. @@ -306,7 +306,7 @@ class ProxySet(MutableSet): def isExitRelay(self, ip): """Check if ``ip`` is a known Tor exit relay. - :type ip: basestring or int + :type ip: str or int :param ip: The IP address to check. :rtype: boolean :returns: True if ``ip`` is a known Tor exit relay; False otherwise. diff --git a/bridgedb/test/test_bridges.py b/bridgedb/test/test_bridges.py index 709ae81..cc1680e 100644 --- a/bridgedb/test/test_bridges.py +++ b/bridgedb/test/test_bridges.py @@ -466,7 +466,7 @@ class BridgeAddressBaseTests(unittest.TestCase): cc = self.bab.country self.assertIsNotNone(cc) - self.assertIsInstance(cc, basestring) + self.assertIsInstance(cc, str) self.assertEqual(len(cc), 2) diff --git a/bridgedb/test/test_captcha.py b/bridgedb/test/test_captcha.py index 328a03c..76f962e 100644 --- a/bridgedb/test/test_captcha.py +++ b/bridgedb/test/test_captcha.py @@ -77,8 +77,8 @@ class ReCaptchaTests(unittest.TestCase): reason += "connection.\nThis test failed with: %s" % error raise unittest.SkipTest(reason) else: - self.assertIsInstance(self.c.image, basestring) - self.assertIsInstance(self.c.challenge, basestring) + self.assertIsInstance(self.c.image, str) + self.assertIsInstance(self.c.challenge, str) finally: # Replace the original environment variable if there was one: if oldkey: @@ -146,7 +146,7 @@ class GimpCaptchaTests(unittest.TestCase): c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) challenge = c.createChallenge('w00t') - self.assertIsInstance(challenge, basestring) + self.assertIsInstance(challenge, str) def test_createChallenge_base64(self): """createChallenge() return value should be urlsafe base64-encoded.""" @@ -189,8 +189,8 @@ class GimpCaptchaTests(unittest.TestCase): c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() - self.assertIsInstance(image, basestring) - self.assertIsInstance(challenge, basestring) + self.assertIsInstance(image, str) + self.assertIsInstance(challenge, str) def test_get_emptyCacheDir(self): """An empty cacheDir should raise GimpCaptchaError.""" diff --git a/bridgedb/test/test_crypto.py b/bridgedb/test/test_crypto.py index 7a34671..000ca0f 100644 --- a/bridgedb/test/test_crypto.py +++ b/bridgedb/test/test_crypto.py @@ -63,14 +63,14 @@ class GetKeyTests(unittest.TestCase): """Test retrieving the secret_key from an empty file.""" filename = os.path.join(os.getcwd(), 'sekrit') key = crypto.getKey(filename) - self.failUnlessIsInstance(key, basestring, + self.failUnlessIsInstance(key, str, "key isn't a string! type=%r" % type(key)) def test_getKey_tmpfile(self): """Test retrieving the secret_key from a new tmpfile.""" filename = self.mktemp() key = crypto.getKey(filename) - self.failUnlessIsInstance(key, basestring, + self.failUnlessIsInstance(key, str, "key isn't a string! type=%r" % type(key)) def test_getKey_keyexists(self): @@ -81,7 +81,7 @@ class GetKeyTests(unittest.TestCase): fh.flush() key = crypto.getKey(filename) - self.failUnlessIsInstance(key, basestring, + self.failUnlessIsInstance(key, str, "key isn't a string! type=%r" % type(key)) self.assertEqual(SEKRIT_KEY, key, """The example key and the one read from file differ! diff --git a/bridgedb/test/test_geo.py b/bridgedb/test/test_geo.py index 4ca6cbb..371882c 100644 --- a/bridgedb/test/test_geo.py +++ b/bridgedb/test/test_geo.py @@ -50,7 +50,7 @@ class GeoTests(unittest.TestCase): """Should return the CC since the IP is an ``ipaddr.IPAddress``.""" cc = geo.getCountryCode(self.ipv4) self.assertIsNotNone(cc) - self.assertIsInstance(cc, basestring) + self.assertIsInstance(cc, str) self.assertEqual(len(cc), 2) self.assertEqual(cc, self.expectedCC) @@ -77,7 +77,7 @@ class GeoTests(unittest.TestCase): """Should return the CC since the IP is an ``ipaddr.IPAddress``.""" cc = geo.getCountryCode(self.ipv6) self.assertIsNotNone(cc) - self.assertIsInstance(cc, basestring) + self.assertIsInstance(cc, str) self.assertEqual(len(cc), 2) self.assertEqual(cc, self.expectedCC) diff --git a/bridgedb/test/test_parse_addr.py b/bridgedb/test/test_parse_addr.py index 4659efb..81e4508 100644 --- a/bridgedb/test/test_parse_addr.py +++ b/bridgedb/test/test_parse_addr.py @@ -226,7 +226,7 @@ class ParseAddrIsIPAddressTests(unittest.TestCase): log.msg("addr.isIPAddress(%r) => %s" % (testAddress, result)) self.assertTrue(result is not None, "Got a None for testAddress: %r" % testAddress) - self.assertFalse(isinstance(result, basestring), + self.assertFalse(isinstance(result, str), "Expected %r result from isIPAddress(%r): %r %r" % (bool, testAddress, result, type(result))) @@ -709,7 +709,7 @@ class PortListTest(unittest.TestCase): """ ports = (443, 9001, 9030) portList = addr.PortList(*ports) - self.assertTrue(isinstance(str(portList), basestring)) + self.assertTrue(isinstance(str(portList), str)) for port in ports: self.assertIn(str(port), str(portList)) diff --git a/bridgedb/test/test_persistent.py b/bridgedb/test/test_persistent.py index 858ad1a..6547475 100644 --- a/bridgedb/test/test_persistent.py +++ b/bridgedb/test/test_persistent.py @@ -142,8 +142,8 @@ class StateTest(unittest.TestCase): setattr(thatConfig, 'BAR', 'all of the things') setattr(thatConfig, 'LOGFILE', 42) - this(thatConfig).should.have.property('FOO').being.a(basestring) - this(thatConfig).should.have.property('BAR').being.a(basestring) + this(thatConfig).should.have.property('FOO').being.a(str) + this(thatConfig).should.have.property('BAR').being.a(str) this(thatConfig).should.have.property('LOGFILE').being.an(int) this(thatConfig).should.have.property('BRIDGE_FILES').being.a(list) @@ -156,8 +156,8 @@ class StateTest(unittest.TestCase): thatState.useChangedSettings(thatConfig) the(thatState.FOO).should.equal('fuuuuu') - the(thatState).should.have.property('FOO').being.a(basestring) - the(thatState).should.have.property('BAR').being.a(basestring) + the(thatState).should.have.property('FOO').being.a(str) + the(thatState).should.have.property('BAR').being.a(str) the(thatState).should.have.property('LOGFILE').being.an(int) the(thatState.FOO).must.equal(thatConfig.FOO) the(thatState.BAR).must.equal(thatConfig.BAR) diff --git a/bridgedb/test/test_persistentSaveAndLoad.py b/bridgedb/test/test_persistentSaveAndLoad.py index 6d6584d..18f601e 100644 --- a/bridgedb/test/test_persistentSaveAndLoad.py +++ b/bridgedb/test/test_persistentSaveAndLoad.py @@ -85,12 +85,12 @@ class StateSaveAndLoadTests(unittest.TestCase): def test_get_statefile(self): statefile = self.state._get_statefile() - self.assertIsInstance(statefile, basestring) + self.assertIsInstance(statefile, str) def test_set_statefile(self): self.state._set_statefile('bar.state') statefile = self.state._get_statefile() - self.assertIsInstance(statefile, basestring) + self.assertIsInstance(statefile, str) def test_set_statefile_new_dir(self): config = self.config diff --git a/bridgedb/test/test_proxy.py b/bridgedb/test/test_proxy.py index 0a69eb0..c55e03c 100644 --- a/bridgedb/test/test_proxy.py +++ b/bridgedb/test/test_proxy.py @@ -393,13 +393,13 @@ class ProxySetUnittests(unittest.TestCase): def test_ProxySet_addProxies_bad_type(self): """``ProxySet.addProxies()`` called with something which is neither an - iterable, a basestring, or an int should raise a ValueError. + iterable, a str, or an int should raise a ValueError. """ self.assertRaises(ValueError, self.proxyList.addProxies, object) def test_ProxySet_addProxies_list_of_bad_types(self): """``ProxySet.addProxies()`` called with something which is neither an - iterable, a basestring, or an int should raise a ValueError. + iterable, a str, or an int should raise a ValueError. """ self.assertRaises(ValueError, self.proxyList.addProxies, [object, object, object]) diff --git a/bridgedb/test/test_txrecaptcha.py b/bridgedb/test/test_txrecaptcha.py index 2550c3d..22505b9 100644 --- a/bridgedb/test/test_txrecaptcha.py +++ b/bridgedb/test/test_txrecaptcha.py @@ -220,7 +220,7 @@ class SubmitTests(unittest.TestCase): """ self.assertIsInstance(response, txrecaptcha.RecaptchaResponse) self.assertIsInstance(response.is_valid, bool) - self.assertIsInstance(response.error_code, basestring) + self.assertIsInstance(response.error_code, str) d = txrecaptcha.submit(self.challenge, self.response, self.key, self.ip) diff --git a/bridgedb/test/test_util.py b/bridgedb/test/test_util.py index e858861..55ce35f 100644 --- a/bridgedb/test/test_util.py +++ b/bridgedb/test/test_util.py @@ -169,7 +169,7 @@ class JustifiedLogFormatterTests(unittest.TestCase): formatter = util.JustifiedLogFormatter() formatted = formatter.format(self.record) self.assertIsInstance(formatter, logging.Formatter) - self.assertIsInstance(formatted, basestring) + self.assertIsInstance(formatted, str) self.assertNotEqual(formatted, '') self.assertTrue('INFO' in formatted) self.assertTrue('This is a message' in formatted)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2020