February 2020 - tor-commits - lists.torproject.org

[bridgedb/develop] 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/develop] Fix exception catching syntax
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 39fd0a30d9f912908da2d9f9528fcd69b7bad8f3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 14:03:23 2020 -0800 Fix exception catching syntax Python 3.x deprecated old exception syntax... before: "except ValueError, exc:" after: "except ValueError as exc:" This didn't change the test outcome... before: FAILED (skips=1, failures=7, errors=49, successes=255) after: FAILED (skips=1, failures=7, errors=49, successes=255) --- bridgedb/Storage.py | 2 +- bridgedb/test/test_parse_descriptors.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bridgedb/Storage.py b/bridgedb/Storage.py index 4182c4b..3cc6c09 100644 --- a/bridgedb/Storage.py +++ b/bridgedb/Storage.py @@ -374,7 +374,7 @@ class DBGeneratorContextManager(GeneratorContextManager): try: self.gen.throw(type, value, traceback) raise RuntimeError("generator didn't stop after throw()") - except StopIteration, exc: + except StopIteration as exc: # Suppress the exception *unless* it's the same exception that # was passed to throw(). This prevents a StopIteration # raised inside the "with" statement from being suppressed diff --git a/bridgedb/test/test_parse_descriptors.py b/bridgedb/test/test_parse_descriptors.py index df7f34f..7fd7582 100644 --- a/bridgedb/test/test_parse_descriptors.py +++ b/bridgedb/test/test_parse_descriptors.py @@ -28,7 +28,7 @@ try: from stem.descriptor.extrainfo_descriptor import RelayExtraInfoDescriptor from stem.descriptor.router_status_entry import RouterStatusEntryV3 from bridgedb.parse import descriptors -except (ImportError, NameError), error: +except (ImportError, NameError) as error: print("There was an error importing stem: %s" % error) else: HAS_STEM = True

1 0

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

19 Feb '20

commit e38377c267a6e3829bf191b19c8a8f3551c0b5c4 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 14:30:59 2020 -0800 Fix octal numbers Python changed its syntax for octal numbers... https://stackoverflow.com/questions/11620151/what-do-numbers-starting-with-… This fixes exceptions such as... 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 "/home/atagar/Desktop/tor/bridgedb/bridgedb/bridges.py", line 52, in <module> from bridgedb import bridgerequest File "/home/atagar/Desktop/tor/bridgedb/bridgedb/bridgerequest.py", line 27, in <module> from bridgedb.crypto import getHMACFunc builtins.SyntaxError: invalid token (crypto.py, line 105) This didn't change the test outcome... before: FAILED (skips=1, failures=7, errors=48, successes=256) after: FAILED (skips=1, failures=7, errors=48, successes=256) --- bridgedb/crypto.py | 4 ++-- bridgedb/test/test_captcha.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bridgedb/crypto.py b/bridgedb/crypto.py index ac2e3ec..ee9d099 100644 --- a/bridgedb/crypto.py +++ b/bridgedb/crypto.py @@ -89,7 +89,7 @@ class RSAKeyGenerationError(Exception): def writeKeyToFile(key, filename): - """Write **key** to **filename**, with ``0400`` permissions. + """Write **key** to **filename**, with ``400`` octal permissions. If **filename** doesn't exist, it will be created. If it does exist already, and is writable by the owner of the current process, then it will @@ -102,7 +102,7 @@ def writeKeyToFile(key, filename): """ logging.info("Writing key to file: %r" % filename) flags = os.O_WRONLY | os.O_TRUNC | os.O_CREAT | getattr(os, "O_BIN", 0) - fd = os.open(filename, flags, 0400) + fd = os.open(filename, flags, 0o400) os.write(fd, key) os.fsync(fd) os.close(fd) diff --git a/bridgedb/test/test_captcha.py b/bridgedb/test/test_captcha.py index 76f962e..281aadc 100644 --- a/bridgedb/test/test_captcha.py +++ b/bridgedb/test/test_captcha.py @@ -207,7 +207,7 @@ class GimpCaptchaTests(unittest.TestCase): with open(badFile, 'w') as fh: fh.write(' ') fh.flush() - os.chmod(badFile, 0266) + os.chmod(badFile, 0o266) c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.badCacheDir)

1 0

[bridgedb/develop] Context manager class is now private
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit c484f6553da7bedeeb42cac724687620968e5f16 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 14:11:39 2020 -0800 Context manager class is now private BridgeDB shouldn't use GeneratorContextManager, but if it does this class is now under a new name... 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_Storage.py", line 13, in <module> import bridgedb.Storage as Storage File "/home/atagar/Desktop/tor/bridgedb/bridgedb/Storage.py", line 11, in <module> from contextlib import GeneratorContextManager builtins.ImportError: cannot import name 'GeneratorContextManager' This still doesn't change test outcome due to further Storage.py issues... before: FAILED (skips=1, failures=7, errors=49, successes=255) after: FAILED (skips=1, failures=7, errors=49, successes=255) --- bridgedb/Storage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridgedb/Storage.py b/bridgedb/Storage.py index 3cc6c09..c7385ba 100644 --- a/bridgedb/Storage.py +++ b/bridgedb/Storage.py @@ -8,7 +8,7 @@ import binascii import sqlite3 import time import hashlib -from contextlib import GeneratorContextManager +from contextlib import _GeneratorContextManager from functools import wraps from ipaddr import IPAddress import sys @@ -345,7 +345,7 @@ def openDatabase(sqlite_file): return conn -class DBGeneratorContextManager(GeneratorContextManager): +class DBGeneratorContextManager(_GeneratorContextManager): """Helper for @contextmanager decorator. Overload __exit__() so we can call the generator many times

1 0

[bridgedb/develop] Replace func_doc with __doc__
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit dfb152f6bac4bca465f309b6d9089f013fc456cc Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 14:48:52 2020 -0800 Replace func_doc with __doc__ Python 3.x renamed func_x functions to __x__... https://docs.python.org/3.0/whatsnew/3.0.html#operators-and-special-methods 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 "/home/atagar/Desktop/tor/bridgedb/bridgedb/filters.py", line 127, in <module> byIPv4 = byIPv(4) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/filters.py", line 122, in byIPv _byIPv.func_doc = _byIPv.func_doc.format(ipVersion) builtins.AttributeError: 'function' object has no attribute 'func_doc' This finally progresses our test outcome quite a bit... before: FAILED (skips=1, failures=7, errors=48, successes=256) after: FAILED (skips=2, failures=7, errors=144, successes=321) --- bridgedb/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/filters.py b/bridgedb/filters.py index a02661e..78cb73e 100644 --- a/bridgedb/filters.py +++ b/bridgedb/filters.py @@ -119,7 +119,7 @@ def byIPv(ipVersion=None): return False setattr(_byIPv, "description", "ip=%d" % ipVersion) _byIPv.__name__ = "byIPv%d()" % ipVersion - _byIPv.func_doc = _byIPv.func_doc.format(ipVersion) + _byIPv.__doc__ = _byIPv.__doc__.format(ipVersion) _byIPv.name = name _cache[name] = _byIPv return _byIPv

1 0

[bridgedb/develop] Replace long with int
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 40b44a281b5b83ca6b240f201ea49f38ceaa0957 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 14:20:22 2020 -0800 Replace long with int Python 3.x no longer has a separate long integer type (integers handle this under the covers). This fixes exceptions such as... 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) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_Storage.py", line 13, in <module> import bridgedb.Storage as Storage File "/home/atagar/Desktop/tor/bridgedb/bridgedb/Storage.py", line 16, in <module> from bridgedb.Stability import BridgeHistory File "/home/atagar/Desktop/tor/bridgedb/bridgedb/Stability.py", line 36, in <module> discountIntervalMillis = long(60*60*12*1000) builtins.NameError: name 'long' is not defined This didn't change the test results much... before: FAILED (skips=1, failures=7, errors=49, successes=255) after: FAILED (skips=1, failures=7, errors=48, successes=256) --- bridgedb/Bridges.py | 2 +- bridgedb/Stability.py | 36 ++++++++++++++++++------------------ bridgedb/bridgerequest.py | 2 +- bridgedb/test/deprecated.py | 2 +- bridgedb/test/legacy_Tests.py | 6 +++--- bridgedb/test/test_parse_addr.py | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index 7ec60e6..20a78cb 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -374,7 +374,7 @@ class FixedBridgeSplitter(object): def insert(self, bridge): # Grab the first 4 bytes digest = self.hmac(bridge.identity) - pos = long( digest[:8], 16 ) + pos = int( digest[:8], 16 ) which = pos % len(self.rings) self.rings[which].insert(bridge) diff --git a/bridgedb/Stability.py b/bridgedb/Stability.py index f2f99ce..c7bd454 100644 --- a/bridgedb/Stability.py +++ b/bridgedb/Stability.py @@ -33,7 +33,7 @@ from bridgedb.schedule import toUnixSeconds # tunables weighting_factor = float(19)/float(20) -discountIntervalMillis = long(60*60*12*1000) +discountIntervalMillis = 60*60*12*1000 class BridgeHistory(object): @@ -76,15 +76,15 @@ class BridgeHistory(object): self.fingerprint = fingerprint self.ip = ip self.port = port - self.weightedUptime = long(weightedUptime) - self.weightedTime = long(weightedTime) - self.weightedRunLength = long(weightedRunLength) + self.weightedUptime = int(weightedUptime) + self.weightedTime = int(weightedTime) + self.weightedRunLength = int(weightedRunLength) self.totalRunWeights = float(totalRunWeights) self.lastSeenWithDifferentAddressAndPort = \ - long(lastSeenWithDifferentAddressAndPort) - self.lastSeenWithThisAddressAndPort = long(lastSeenWithThisAddressAndPort) - self.lastDiscountedHistoryValues = long(lastDiscountedHistoryValues) - self.lastUpdatedWeightedTime = long(lastUpdatedWeightedTime) + int(lastSeenWithDifferentAddressAndPort) + self.lastSeenWithThisAddressAndPort = int(lastSeenWithThisAddressAndPort) + self.lastDiscountedHistoryValues = int(lastDiscountedHistoryValues) + self.lastUpdatedWeightedTime = int(lastUpdatedWeightedTime) def discountWeightedFractionalUptimeAndWeightedTime(self, discountUntilMillis): """ discount weighted times """ @@ -111,8 +111,8 @@ class BridgeHistory(object): @property def weightedFractionalUptime(self): """Weighted Fractional Uptime""" - if self.weightedTime <0.0001: return long(0) - return long(10000) * self.weightedUptime / self.weightedTime + if self.weightedTime <0.0001: return 0 + return 10000 * self.weightedUptime / self.weightedTime @property def tosa(self): @@ -127,7 +127,7 @@ class BridgeHistory(object): more recently than it, or if it has been around for a Weighted Time of 8 days. """ # if this bridge has been around longer than 8 days - if self.weightedTime >= long(8 * 24 * 60 * 60): + if self.weightedTime >= 8 * 24 * 60 * 60: return True # return True if self.weightedTime is greater than the weightedTime @@ -146,10 +146,10 @@ class BridgeHistory(object): """Weighted Mean Time Between Address Change""" totalRunLength = self.weightedRunLength + \ ((self.lastSeenWithThisAddressAndPort - - self.lastSeenWithDifferentAddressAndPort) / long(1000)) + self.lastSeenWithDifferentAddressAndPort) / 1000) totalWeights = self.totalRunWeights + 1.0 - if totalWeights < 0.0001: return long(0) + if totalWeights < 0.0001: return 0 assert(isinstance(long,totalRunLength)) assert(isinstance(long,totalWeights)) return totalRunlength / totalWeights @@ -159,9 +159,9 @@ def addOrUpdateBridgeHistory(bridge, timestamp): bhe = db.getBridgeHistory(bridge.fingerprint) if not bhe: # This is the first status, assume 60 minutes. - secondsSinceLastStatusPublication = long(60*60) - lastSeenWithDifferentAddressAndPort = timestamp * long(1000) - lastSeenWithThisAddressAndPort = timestamp * long(1000) + secondsSinceLastStatusPublication = 60*60 + lastSeenWithDifferentAddressAndPort = timestamp * 1000 + lastSeenWithThisAddressAndPort = timestamp * 1000 bhe = BridgeHistory( bridge.fingerprint, bridge.address, bridge.orPort, @@ -179,9 +179,9 @@ def addOrUpdateBridgeHistory(bridge, timestamp): # Calculate the seconds since the last parsed status. If this is # the first status or we haven't seen a status for more than 60 # minutes, assume 60 minutes. - statusPublicationMillis = long(timestamp * 1000) + statusPublicationMillis = timestamp * 1000 if (statusPublicationMillis - bhe.lastSeenWithThisAddressAndPort) > 60*60*1000: - secondsSinceLastStatusPublication = long(60*60) + secondsSinceLastStatusPublication = 60*60 logging.debug("Capping secondsSinceLastStatusPublication to 1 hour") # otherwise, roll with it else: diff --git a/bridgedb/bridgerequest.py b/bridgedb/bridgerequest.py index 7bd7b64..821bd7c 100644 --- a/bridgedb/bridgerequest.py +++ b/bridgedb/bridgerequest.py @@ -164,7 +164,7 @@ class BridgeRequestBase(object): # Get an HMAC with the key of the client identifier: digest = getHMACFunc(key)(client) # Take the lower 8 bytes of the digest and convert to a long: - position = long(digest[:8], 16) + position = int(digest[:8], 16) return position def isValid(self, valid=None): diff --git a/bridgedb/test/deprecated.py b/bridgedb/test/deprecated.py index ab7c502..1a71bf1 100644 --- a/bridgedb/test/deprecated.py +++ b/bridgedb/test/deprecated.py @@ -126,7 +126,7 @@ class Bridge(object): if not request: request = 'default' digest = getHMACFunc('Order-Or-Addresses')(request) - pos = long(digest[:8], 16) # lower 8 bytes -> long + pos = int(digest[:8], 16) # lower 8 bytes -> int # default address type if not addressClass: addressClass = ipaddr.IPv4Address diff --git a/bridgedb/test/legacy_Tests.py b/bridgedb/test/legacy_Tests.py index 37bce70..93b52a7 100644 --- a/bridgedb/test/legacy_Tests.py +++ b/bridgedb/test/legacy_Tests.py @@ -229,7 +229,7 @@ class BridgeStabilityTests(unittest.TestCase): 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 + time_on_address = 60*30*60 # 30 hours downtime = 60*60*random.randint(0,4) # random hours of downtime for t in timestampSeries(now): @@ -258,8 +258,8 @@ class BridgeStabilityTests(unittest.TestCase): [ bridgedb.Stability.addOrUpdateBridgeHistory(b, t) for t in ts ] b = db.getBridgeHistory(b.fingerprint) assert b.tosa == ts[-1] - last_seen - assert (long(last_seen*1000) == b.lastSeenWithDifferentAddressAndPort) - assert (long(ts[-1]*1000) == b.lastSeenWithThisAddressAndPort) + assert (last_seen*1000 == b.lastSeenWithDifferentAddressAndPort) + assert (ts[-1]*1000 == b.lastSeenWithThisAddressAndPort) def testFamiliar(self): # create some bridges diff --git a/bridgedb/test/test_parse_addr.py b/bridgedb/test/test_parse_addr.py index 124ea0f..8183167 100644 --- a/bridgedb/test/test_parse_addr.py +++ b/bridgedb/test/test_parse_addr.py @@ -735,7 +735,7 @@ class PortListTest(unittest.TestCase): """Test ``__getitem__`` with a string.""" ports = (443, 9001, 9030) portList = addr.PortList(*ports) - self.assertEqual(portList.__getitem__(long(0)), 9001) + self.assertEqual(portList.__getitem__(0), 9001) def test_mixedArgs(self): """Create a :class:`addr.PortList` with mixed type parameters."""

1 0

[bridgedb/develop] Remove old buffer handling
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 131ed04840bc002b8c6e50cd03465c0cbbff2aca Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 14:40:21 2020 -0800 Remove old buffer handling Honestly I'm confused what isis was attempting to do here. This has something to do with old python version compatability so it's likely moot. Python 3.x replaced buffer() with memoryview()... https://stackoverflow.com/questions/50160187/buffer-function-for-python-3 ... so we could likely could make that replacement. But instead lets try to simply rip this out. 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 "/home/atagar/Desktop/tor/bridgedb/bridgedb/bridgerequest.py", line 27, in <module> from bridgedb.crypto import getHMACFunc File "/home/atagar/Desktop/tor/bridgedb/bridgedb/crypto.py", line 74, in <module> io.BytesIO(buffer('test')) builtins.NameError: name 'buffer' is not defined This didn't change test outcome... before: FAILED (skips=1, failures=7, errors=48, successes=256) after: FAILED (skips=1, failures=7, errors=48, successes=256) --- bridgedb/crypto.py | 20 -------------------- bridgedb/distributors/email/autoresponder.py | 15 ++------------- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/bridgedb/crypto.py b/bridgedb/crypto.py index ee9d099..b39c659 100644 --- a/bridgedb/crypto.py +++ b/bridgedb/crypto.py @@ -57,29 +57,9 @@ from Crypto.PublicKey import RSA from twisted.internet import ssl from twisted.python.procutils import which - #: The hash digest to use for HMACs. DIGESTMOD = hashlib.sha1 -# Test to see if we have the old or new style buffer() interface. Trying -# to use an old-style buffer on Python2.7 prior to version 2.7.5 will produce: -# -# TypeError: 'buffer' does not have the buffer interface -# -#: ``True`` if we have the new-style `buffer`_ interface; ``False`` otherwise. -#: -#: .. _buffer: https://docs.python.org/2/c-api/buffer.html -NEW_BUFFER_INTERFACE = False -try: - io.BytesIO(buffer('test')) -except TypeError: # pragma: no cover - logging.warn( - "This Python version is too old! "\ - "It doesn't support new-style buffer interfaces: "\ - "https://mail.python.org/pipermail/python-dev/2010-October/104917.html") -else: - NEW_BUFFER_INTERFACE = True - class PKCS1PaddingError(Exception): """Raised when there is a problem adding or removing PKCS#1 padding.""" diff --git a/bridgedb/distributors/email/autoresponder.py b/bridgedb/distributors/email/autoresponder.py index b00feeb..bc1c7b9 100644 --- a/bridgedb/distributors/email/autoresponder.py +++ b/bridgedb/distributors/email/autoresponder.py @@ -51,7 +51,6 @@ from twisted.python import failure from bridgedb import strings from bridgedb import metrics from bridgedb import safelog -from bridgedb.crypto import NEW_BUFFER_INTERFACE from bridgedb.distributors.email import dkim from bridgedb.distributors.email import request from bridgedb.distributors.email import templates @@ -183,22 +182,12 @@ class EmailResponse(object): the email.) - :vartype _buff: :any:`unicode` or :any:`buffer` - :var _buff: Used internally to write lines for the response email into the - ``_mailfile``. The reason why both of these attributes have two - possible types is for the same Python-buggy reasons which require - :data:`~bridgedb.crypto.NEW_BUFFER_INTERFACE`. - :vartype mailfile: :class:`io.StringIO` or :class:`io.BytesIO` - :var mailfile: An in-memory file-like object for storing the formatted - headers and body of the response email. :var str delimiter: Delimiter between lines written to the :data:`mailfile`. :var bool closed: ``True`` if :meth:`close` has been called. :vartype to: :api:`twisted.mail.smtp.Address` :var to: The client's email address, to which this response should be sent. """ - _buff = buffer if NEW_BUFFER_INTERFACE else unicode - mailfile = io.BytesIO if NEW_BUFFER_INTERFACE else io.StringIO def __init__(self, gpgSignFunc=None): """Create a response to an email we have recieved. @@ -212,7 +201,7 @@ class EmailResponse(object): obtaining a pre-configured **gpgSignFunc**. """ self.gpgSign = gpgSignFunc - self.mailfile = self.mailfile() + self.mailfile = io.StringIO() self.delimiter = '\n' self.closed = False self.to = None @@ -281,7 +270,7 @@ class EmailResponse(object): self.writelines(line) else: line += self.delimiter - self.mailfile.write(self._buff(line.encode('utf8'))) + self.mailfile.write(line.encode('utf8')) self.mailfile.flush() def writelines(self, lines):

1 0

[bridgedb/develop] Drop broken local import
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit d4d57fda0d0a4bdbdea773407dac453c29634a11 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 15:47:56 2020 -0800 Drop broken local import I'm unsure why this modules importing these, but the local imports are broken... 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 705, in findByName return self.loadFile(_name, recurse=recurse) ... File "./bridgedb/test/test_email_request.py", line 20, in <module> from bridgedb.distributors.email import request File "/home/atagar/Desktop/tor/bridgedb/bridgedb/distributors/email/__init__.py", line 19, in <module> import autoresponder builtins.ImportError: No module named 'autoresponder' Dropping these gets us closer... before: FAILED (skips=2, failures=7, errors=143, successes=324) after: FAILED (skips=2, failures=7, errors=154, successes=351) --- bridgedb/distributors/email/__init__.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bridgedb/distributors/email/__init__.py b/bridgedb/distributors/email/__init__.py index 5c0ef50..16f439d 100644 --- a/bridgedb/distributors/email/__init__.py +++ b/bridgedb/distributors/email/__init__.py @@ -16,9 +16,3 @@ distributor. ''' -import autoresponder -import distributor -import dkim -import request -import server -import templates

1 0

[bridgedb/develop] Replace zope implements with implementer
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit c86157c8ec59bc04de27f5262e928aaba341d37c Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 15:43:50 2020 -0800 Replace zope implements with implementer Personally I've never used zope, but these exceptions seem pretty clear... 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 "/home/atagar/Desktop/tor/bridgedb/bridgedb/distribute.py", line 163, in Distributor implements(IDistribute) File "/usr/local/lib/python3.5/dist-packages/zope/interface/declarations.py", line 483, in implements raise TypeError(_ADVICE_ERROR % 'implementer') builtins.TypeError: Class advice impossible in Python3. Use the @implementer class decorator instead. Test results changed as follows... before: FAILED (skips=2, failures=7, errors=144, successes=321) after: FAILED (skips=2, failures=7, errors=143, successes=324) --- bridgedb/captcha.py | 4 ++-- bridgedb/distribute.py | 4 ++-- bridgedb/distributors/email/server.py | 8 ++++---- bridgedb/txrecaptcha.py | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bridgedb/captcha.py b/bridgedb/captcha.py index 49cf838..b758c09 100644 --- a/bridgedb/captcha.py +++ b/bridgedb/captcha.py @@ -67,7 +67,7 @@ import urllib.request from BeautifulSoup import BeautifulSoup -from zope.interface import Interface, Attribute, implements +from zope.interface import Interface, Attribute, implementer from bridgedb import crypto from bridgedb import schedule @@ -101,6 +101,7 @@ class ICaptcha(Interface): """Retrieve a new CAPTCHA image.""" +@implementer(ICaptcha) class Captcha(object): """A generic CAPTCHA base class. @@ -117,7 +118,6 @@ class Captcha(object): :ivar secretKey: A private key used for decrypting challenge strings during CAPTCHA solution verification. """ - implements(ICaptcha) def __init__(self, publicKey=None, secretKey=None): """Obtain a new CAPTCHA for a client.""" diff --git a/bridgedb/distribute.py b/bridgedb/distribute.py index ec8fb26..42706c9 100644 --- a/bridgedb/distribute.py +++ b/bridgedb/distribute.py @@ -108,7 +108,7 @@ import math from zope import interface from zope.interface import Attribute -from zope.interface import implements +from zope.interface import implementer # from bridgedb.hashring import IHashring from bridgedb.interfaces import IName @@ -155,12 +155,12 @@ class IDistribute(IName): """Get bridges based on a client's **bridgeRequest**.""" +@implementer(IDistribute) class Distributor(Named): """A :class:`Distributor` distributes bridges to clients. Inherit from me to create a new type of ``Distributor``. """ - implements(IDistribute) _bridgesPerResponseMin = 1 _bridgesPerResponseMax = 3 diff --git a/bridgedb/distributors/email/server.py b/bridgedb/distributors/email/server.py index 5a1ffc0..051ce74 100644 --- a/bridgedb/distributors/email/server.py +++ b/bridgedb/distributors/email/server.py @@ -62,7 +62,7 @@ from twisted.mail import smtp from twisted.mail.smtp import rfc822date from twisted.python import failure -from zope.interface import implements +from zope.interface import implementer from bridgedb import __version__ from bridgedb import safelog @@ -165,6 +165,7 @@ class MailServerContext(object): return canon +(a)implementer(smtp.IMessage) class SMTPMessage(object): """Plugs into the Twisted Mail and receives an incoming message. @@ -186,7 +187,6 @@ class SMTPMessage(object): :meth:`~bridgedb.distributors.email.autoresponder.SMTPAutoresponder.reply` email and :meth:`~bridgedb.distributors.email.autoresponder.SMTPAutoresponder.send` it. """ - implements(smtp.IMessage) def __init__(self, context, canonicalFromSMTP=None): """Create a new SMTPMessage. @@ -258,6 +258,7 @@ class SMTPMessage(object): return rfc822.Message(rawMessage) +(a)implementer(smtp.IMessageDelivery) class SMTPIncomingDelivery(smtp.SMTP): """Plugs into :class:`SMTPIncomingServerFactory` and handles SMTP commands for incoming connections. @@ -272,7 +273,6 @@ class SMTPIncomingDelivery(smtp.SMTP): :var fromCanonicalSMTP: If set, this is the canonicalized domain name of the address we received from incoming connection's ``MAIL FROM:``. """ - implements(smtp.IMessageDelivery) context = None deferred = defer.Deferred() @@ -395,6 +395,7 @@ class SMTPIncomingDelivery(smtp.SMTP): return lambda: SMTPMessage(self.context, self.fromCanonicalSMTP) +(a)implementer(smtp.IMessageDeliveryFactory) class SMTPIncomingDeliveryFactory(object): """Factory for :class:`SMTPIncomingDelivery` s. @@ -408,7 +409,6 @@ class SMTPIncomingDeliveryFactory(object): :var delivery: A :class:`SMTPIncomingDelivery` to deliver incoming SMTP messages to. """ - implements(smtp.IMessageDeliveryFactory) context = None delivery = SMTPIncomingDelivery diff --git a/bridgedb/txrecaptcha.py b/bridgedb/txrecaptcha.py index fc4ca2f..885b40d 100644 --- a/bridgedb/txrecaptcha.py +++ b/bridgedb/txrecaptcha.py @@ -41,7 +41,7 @@ from twisted.web import client from twisted.web.http_headers import Headers from twisted.web.iweb import IBodyProducer -from zope.interface import implements +from zope.interface import implementer from bridgedb.crypto import SSLVerifyingContextFactory @@ -209,9 +209,9 @@ class RecaptchaResponseProtocol(protocol.Protocol): self.finished.callback(result) +@implementer(IBodyProducer) class _BodyProducer(object): """I write a string into the HTML body of an open request.""" - implements(IBodyProducer) def __init__(self, body): self.body = body

1 0

[bridgedb/develop] Replace urllib2 with urllib.request
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit c0b8941b4ffdf0d8a182cfa04eb65f57576c2e25 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 15:02:14 2020 -0800 Replace urllib2 with urllib.request Python 3.x renamed this module... 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_captcha.py", line 24, in <module> from bridgedb import captcha File "/home/atagar/Desktop/tor/bridgedb/bridgedb/captcha.py", line 66, in <module> import urllib2 builtins.ImportError: No module named 'urllib2' Test results are unchanged... before: FAILED (skips=2, failures=7, errors=144, successes=321) after: FAILED (skips=2, failures=7, errors=144, successes=321) --- bridgedb/captcha.py | 6 +++--- bridgedb/test/test_captcha.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bridgedb/captcha.py b/bridgedb/captcha.py index 5c67df0..49cf838 100644 --- a/bridgedb/captcha.py +++ b/bridgedb/captcha.py @@ -63,7 +63,7 @@ import logging import random import os import time -import urllib2 +import urllib.request from BeautifulSoup import BeautifulSoup @@ -185,14 +185,14 @@ class ReCaptcha(Captcha): form = "/noscript?k=%s" % self.publicKey # Extract and store image from recaptcha - html = urllib2.urlopen(urlbase + form).read() + html = urllib.request.urlopen(urlbase + form).read() # FIXME: The remaining lines currently cannot be reliably unit tested: soup = BeautifulSoup(html) # pragma: no cover imgurl = urlbase + "/" + soup.find('img')['src'] # pragma: no cover cField = soup.find( # pragma: no cover 'input', {'name': 'recaptcha_challenge_field'}) # pragma: no cover self.challenge = str(cField['value']) # pragma: no cover - self.image = urllib2.urlopen(imgurl).read() # pragma: no cover + self.image = urllib.request.urlopen(imgurl).read() # pragma: no cover class GimpCaptcha(Captcha): diff --git a/bridgedb/test/test_captcha.py b/bridgedb/test/test_captcha.py index 281aadc..24a14a4 100644 --- a/bridgedb/test/test_captcha.py +++ b/bridgedb/test/test_captcha.py @@ -57,7 +57,7 @@ class ReCaptchaTests(unittest.TestCase): def test_get(self): """Test get() method.""" - # Force urllib2 to do anything less idiotic than the defaults: + # Force urllib.request to do anything less idiotic than the defaults: envkey = 'HTTPS_PROXY' oldkey = None if os.environ.has_key(envkey): @@ -65,9 +65,9 @@ class ReCaptchaTests(unittest.TestCase): os.environ[envkey] = '127.0.0.1:9150' # This stupid thing searches the environment for ``<protocol>_PROXY`` # variables, hence the above 'HTTPS_PROXY' env setting: - proxy = captcha.urllib2.ProxyHandler() - opener = captcha.urllib2.build_opener(proxy) - captcha.urllib2.install_opener(opener) + proxy = captcha.urllib.request.ProxyHandler() + opener = captcha.urllib.request.build_opener(proxy) + captcha.urllib.request.install_opener(opener) try: # There isn't really a reliable way to test this function! :(

1 0