tor-commits February 2020

tor-commits@lists.torproject.org

22 participants
1454 discussions

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

19 Feb '20

commit 215fa51bada924ed54702c6670c42307c967705f Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 15:55:51 2020 -0800 Fix metaclass definition Following the metaclass example prescribed by this module... https://docs.python.org/3/library/abc.html 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) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_email_distributor.py", line 32, in <module> from bridgedb.test.util import generateFakeBridges File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/util.py", line 236, in <module> TestCaseMixin.register(unittest.TestCase) builtins.AttributeError: type object 'mixin' has no attribute 'register' Few more passing tests... before: FAILED (skips=2, failures=7, errors=154, successes=351) after: FAILED (skips=6, failures=9, errors=191, successes=359) --- bridgedb/util.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bridgedb/util.py b/bridgedb/util.py index 63f508e..eb20ce7 100644 --- a/bridgedb/util.py +++ b/bridgedb/util.py @@ -360,7 +360,7 @@ class JustifiedLogFormatter(logging.Formatter): return super(JustifiedLogFormatter, self).format(record) -class mixin: +class mixin(metaclass=abc.ABCMeta): """Subclasses of me can be used as a mixin class by registering another class, ``ClassA``, which should be mixed with the ``mixin`` subclass, in order to provide simple, less error-prone, multiple inheritance models:: @@ -407,4 +407,3 @@ class mixin: .. info:: This class' name is lowercased because pylint is hardcoded to expect mixin classes to end in ``'mixin'``. """ - __metaclass__ = abc.ABCMeta

1 0

[bridgedb/develop] Read router status entries as bytes
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 8db4ba1efcdfa8dbe72e1c237eb45fef0f91d79b Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 13:41:20 2020 -0800 Read router status entries as bytes Stem expects descriptors to be bytes. This fixes the following errors... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_parse_descriptors.py", line 392, in test_parse_descriptors_parseNetworkStatusFile_bad_nickname ... File "/home/atagar/Desktop/tor/bridgedb/bridgedb/parse/descriptors.py", line 135, in parseNetworkStatusFile routers.extend(list(document)) File "/usr/local/lib/python3.5/dist-packages/stem/descriptor/router_status_entry.py", line 101, in _parse_file desc_content = bytes.join(b'', desc_lines) builtins.TypeError: sequence item 0: expected a bytes-like object, str found Just fixing that caused the tests to hang due to an infinite loop in descriptor parsing. Unsure why Isis implemented it that way so simply pulling that out. Test results changed as follows... before: FAILED (skips=103, failures=9, errors=189, successes=366) after: FAILED (skips=103, failures=6, errors=183, successes=375) --- bridgedb/parse/descriptors.py | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/bridgedb/parse/descriptors.py b/bridgedb/parse/descriptors.py index 1b01023..ff32226 100644 --- a/bridgedb/parse/descriptors.py +++ b/bridgedb/parse/descriptors.py @@ -122,10 +122,10 @@ def parseNetworkStatusFile(filename, validate=True, skipAnnotations=True, routers = [] logging.info("Parsing networkstatus file: %s" % filename) - with open(filename) as fh: + with open(filename, 'rb') as fh: position = fh.tell() if skipAnnotations: - while not fh.readline().startswith('r '): + while not fh.readline().startswith(b'r '): position = fh.tell() logging.debug("Skipping %d bytes of networkstatus file." % position) fh.seek(position) @@ -161,20 +161,8 @@ def parseServerDescriptorsFile(filename, validate=True): logging.info("Parsing server descriptors with Stem: %s" % filename) descriptorType = 'server-descriptor 1.0' document = parse_file(filename, descriptorType, validate=validate) - routers = list() + return list(document) - # Work around https://bugs.torproject.org/26023 by parsing each descriptor - # at a time and catching any errors not handled in stem: - while True: - try: - routers.append(document.next()) - except StopIteration: - break - except Exception as error: - logging.debug("Error while parsing a bridge server descriptor: %s" - % error) - - return routers def __cmp_published__(x, y): """A custom ``cmp()`` which sorts descriptors by published date.

1 0

[bridgedb/develop] Refactor log messages.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit b170b03a3a7909a93b764c8c8c69ec4b843d0c2e Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Jan 14 09:06:02 2020 +0100 Refactor log messages. These log messages were misleading because they were called from an incorrect place in the code. --- bridgedb/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridgedb/main.py b/bridgedb/main.py index 7c2df6d..7776750 100644 --- a/bridgedb/main.py +++ b/bridgedb/main.py @@ -423,17 +423,17 @@ def run(options, reactor=reactor): logging.info("Reloading decoy bridges...") antibot.loadDecoyBridges(config.DECOY_BRIDGES_FILE) - logging.info("Reparsing bridge descriptors...") (hashring, emailDistributorTmp, ipDistributorTmp, moatDistributorTmp) = createBridgeRings(cfg, proxies, key) - logging.info("Bridges loaded: %d" % len(hashring)) # Initialize our DB. bridgedb.Storage.initializeDBLock() bridgedb.Storage.setDBFilename(cfg.DB_FILE + ".sqlite") + logging.info("Reparsing bridge descriptors...") load(state, hashring, clear=False) + logging.info("Bridges loaded: %d" % len(hashring)) if emailDistributorTmp is not None: emailDistributorTmp.prepopulateRings() # create default rings

1 0

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

19 Feb '20

commit f5cfc688fe7d809c7d76bd6935b5a630fde6401f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 13:33:30 2020 -0800 Fix exec syntax Updating the syntax for exec... https://docs.python.org/2.0/ref/exec.html https://docs.python.org/3/library/functions.html#exec This fixes the following errors... 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_https.py", line 41, in <module> from bridgedb.test.test_Tests import DynamicTestCaseMeta File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_Tests.py", line 29, in <module> from bridgedb.test import legacy_Tests as Tests File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/legacy_Tests.py", line 21, in <module> import bridgedb.main File "/home/atagar/Desktop/tor/bridgedb/bridgedb/main.py", line 24, in <module> from bridgedb import persistent File "/home/atagar/Desktop/tor/bridgedb/bridgedb/persistent.py", line 30, in <module> from bridgedb.configure import Conf builtins.SyntaxError: Missing parentheses in call to 'exec' (configure.py, line 85) This changes test results as follows... before: FAILED (skips=6, failures=9, errors=194, successes=359) after: FAILED (skips=103, failures=9, errors=189, successes=366) --- bridgedb/configure.py | 2 +- bridgedb/test/email_helpers.py | 2 +- bridgedb/test/https_helpers.py | 2 +- bridgedb/test/moat_helpers.py | 2 +- bridgedb/test/test_persistent.py | 2 +- bridgedb/test/test_persistentSaveAndLoad.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bridgedb/configure.py b/bridgedb/configure.py index 0bc4dd1..e069ea3 100644 --- a/bridgedb/configure.py +++ b/bridgedb/configure.py @@ -82,7 +82,7 @@ def loadConfig(configFile=None, configCls=None): if itsSafeToUseLogging: logging.info("Loading settings from config file: '%s'" % conffile) compiled = compile(open(conffile).read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) if itsSafeToUseLogging: logging.debug("New configuration settings:") diff --git a/bridgedb/test/email_helpers.py b/bridgedb/test/email_helpers.py index e149dd5..2fe8cdc 100644 --- a/bridgedb/test/email_helpers.py +++ b/bridgedb/test/email_helpers.py @@ -103,7 +103,7 @@ def _createConfig(configFile=TEST_CONFIG_FILE): configuration = {} TEST_CONFIG_FILE.seek(0) compiled = compile(configFile.read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) config = Conf(**configuration) return config diff --git a/bridgedb/test/https_helpers.py b/bridgedb/test/https_helpers.py index fad841e..8c77085 100644 --- a/bridgedb/test/https_helpers.py +++ b/bridgedb/test/https_helpers.py @@ -107,7 +107,7 @@ def _createConfig(configFile=TEST_CONFIG_FILE): configuration = {} TEST_CONFIG_FILE.seek(0) compiled = compile(configFile.read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) config = Conf(**configuration) return config diff --git a/bridgedb/test/moat_helpers.py b/bridgedb/test/moat_helpers.py index 07b44a0..8c40c82 100644 --- a/bridgedb/test/moat_helpers.py +++ b/bridgedb/test/moat_helpers.py @@ -94,7 +94,7 @@ def _createConfig(configFile=TEST_CONFIG_FILE): configuration = {} TEST_CONFIG_FILE.seek(0) compiled = compile(configFile.read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) config = Conf(**configuration) return config diff --git a/bridgedb/test/test_persistent.py b/bridgedb/test/test_persistent.py index 3ff6d87..72b4b85 100644 --- a/bridgedb/test/test_persistent.py +++ b/bridgedb/test/test_persistent.py @@ -47,7 +47,7 @@ class StateTest(unittest.TestCase): configuration = {} TEST_CONFIG_FILE.seek(0) compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) config = persistent.Conf(**configuration) fakeArgs = ['-c', os.path.join(os.getcwdu(), '..', 'bridgedb.conf')] diff --git a/bridgedb/test/test_persistentSaveAndLoad.py b/bridgedb/test/test_persistentSaveAndLoad.py index 0ebb1e2..07ea73b 100644 --- a/bridgedb/test/test_persistentSaveAndLoad.py +++ b/bridgedb/test/test_persistentSaveAndLoad.py @@ -42,7 +42,7 @@ class StateSaveAndLoadTests(unittest.TestCase): configuration = {} TEST_CONFIG_FILE.seek(0) compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) config = persistent.Conf(**configuration) self.config = config

1 0

[bridgedb/develop] Upgrade to BeautifulSoup version 4
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 8ecf1cb35d252f387e22e947d6240ad4547e1972 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 13:25:30 2020 -0800 Upgrade to BeautifulSoup version 4 Installing beautifulsoup with python 3's pip fails with... You're trying to run a very old release of Beautiful Soup under Python 3. This will not work."<>"Please use Beautiful Soup 4, available through the pip package 'beautifulsoup4'. Attempting to use this as a drop-in replacement. Initially importing bs4 failed with... >>> import bs4 Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/usr/lib/python3/dist-packages/bs4/__init__.py", line 30, in <module> from .builder import builder_registry, ParserRejectedMarkup File "/usr/lib/python3/dist-packages/bs4/builder/__init__.py", line 314, in <module> from . import _html5lib File "/usr/lib/python3/dist-packages/bs4/builder/_html5lib.py", line 70, in <module> class TreeBuilderForHtml5lib(html5lib.treebuilders._base.TreeBuilder): AttributeError: module 'html5lib.treebuilders' has no attribute '_base' Upgrading to a specific version of html5lib as per the following fixed this... https://stackoverflow.com/questions/38447738/beautifulsoup-html5lib-module-… Test results unchanged... before: FAILED (skips=6, failures=9, errors=194, successes=359) after: FAILED (skips=6, failures=9, errors=194, successes=359) --- bridgedb/captcha.py | 3 +-- bridgedb/test/test_https.py | 2 +- bridgedb/test/test_https_server.py | 2 +- requirements.txt | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bridgedb/captcha.py b/bridgedb/captcha.py index b758c09..a4753fa 100644 --- a/bridgedb/captcha.py +++ b/bridgedb/captcha.py @@ -65,8 +65,7 @@ import os import time import urllib.request -from BeautifulSoup import BeautifulSoup - +from bs4 import BeautifulSoup from zope.interface import Interface, Attribute, implementer from bridgedb import crypto diff --git a/bridgedb/test/test_https.py b/bridgedb/test/test_https.py index ffd7281..b6c3e0f 100644 --- a/bridgedb/test/test_https.py +++ b/bridgedb/test/test_https.py @@ -31,7 +31,7 @@ import ipaddr import mechanize import os -from BeautifulSoup import BeautifulSoup +from bs4 import BeautifulSoup from twisted.trial import unittest from twisted.trial.reporter import TestResult diff --git a/bridgedb/test/test_https_server.py b/bridgedb/test/test_https_server.py index 945ea06..3c799ba 100644 --- a/bridgedb/test/test_https_server.py +++ b/bridgedb/test/test_https_server.py @@ -19,7 +19,7 @@ import shutil import ipaddr -from BeautifulSoup import BeautifulSoup +from bs4 import BeautifulSoup from twisted.internet import reactor from twisted.internet import task diff --git a/requirements.txt b/requirements.txt index 5769e11..eed4889 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ Babel==2.8.0 -BeautifulSoup==3.2.2 +beautifulsoup4==4.8.2 +html5lib==1.0b8 Mako==1.1.1 pycryptodome==3.9.6 Twisted==19.10.0

1 0

[bridgedb/develop] Replace usage of unicode function
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit a3104da794ba4fcbe78ac5293d6855f75fc119a8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 15:35:39 2020 -0800 Replace usage of unicode function In most cases unicode() is being called on static strings that are already unicode in python 3.x. In the few instances where these actually seem to attempt normalization the proper way to convert bytes is "my_bytes.decode('utf-8')". This fixes the following exceptions... 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_persistentSaveAndLoad.py", line 31, in <module> TEST_CONFIG_FILE = io.StringIO(unicode("""\ builtins.NameError: name 'unicode' is not defined Test results change as follows... before: FAILED (skips=106, failures=6, errors=182, successes=375) after: FAILED (skips=106, failures=16, errors=273, successes=409) --- bridgedb/distributors/email/server.py | 2 +- bridgedb/test/email_helpers.py | 4 ++-- bridgedb/test/https_helpers.py | 4 ++-- bridgedb/test/moat_helpers.py | 4 ++-- bridgedb/test/test_captcha.py | 2 +- bridgedb/test/test_email_dkim.py | 4 ++-- bridgedb/test/test_email_templates.py | 2 +- bridgedb/test/test_persistent.py | 4 ++-- bridgedb/test/test_persistentSaveAndLoad.py | 4 ++-- bridgedb/test/test_txrecaptcha.py | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bridgedb/distributors/email/server.py b/bridgedb/distributors/email/server.py index 051ce74..c1ce56f 100644 --- a/bridgedb/distributors/email/server.py +++ b/bridgedb/distributors/email/server.py @@ -253,7 +253,7 @@ class SMTPMessage(object): """ rawMessage = io.StringIO() for line in self.lines: - rawMessage.writelines(unicode(line.decode('utf8')) + u'\n') + rawMessage.writelines(line.decode('utf8') + '\n') rawMessage.seek(0) return rfc822.Message(rawMessage) diff --git a/bridgedb/test/email_helpers.py b/bridgedb/test/email_helpers.py index 2fe8cdc..edc8196 100644 --- a/bridgedb/test/email_helpers.py +++ b/bridgedb/test/email_helpers.py @@ -52,7 +52,7 @@ EMAIL_FROM_ADDR = "bridges@localhost" EMAIL_BIND_IP = "127.0.0.1" EMAIL_PORT = 5225 -TEST_CONFIG_FILE = io.StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO("""\ EMAIL_DIST = %s EMAIL_ROTATION_PERIOD = %s EMAIL_INCLUDE_FINGERPRINTS = %s @@ -96,7 +96,7 @@ EMAIL_PORT = %s repr(EMAIL_N_BRIDGES_PER_ANSWER), repr(EMAIL_FROM_ADDR), repr(EMAIL_BIND_IP), - repr(EMAIL_PORT)))) + repr(EMAIL_PORT))) def _createConfig(configFile=TEST_CONFIG_FILE): diff --git a/bridgedb/test/https_helpers.py b/bridgedb/test/https_helpers.py index 8c77085..ca268c9 100644 --- a/bridgedb/test/https_helpers.py +++ b/bridgedb/test/https_helpers.py @@ -50,7 +50,7 @@ CSP_ENABLED = True CSP_REPORT_ONLY = True CSP_INCLUDE_SELF = True -TEST_CONFIG_FILE = io.StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO("""\ SERVER_PUBLIC_FQDN = %r SERVER_PUBLIC_EXTERNAL_IP = %r HTTPS_DIST = %r @@ -100,7 +100,7 @@ CSP_INCLUDE_SELF = %r GIMP_CAPTCHA_RSA_KEYFILE, CSP_ENABLED, CSP_REPORT_ONLY, - CSP_INCLUDE_SELF))) + CSP_INCLUDE_SELF)) def _createConfig(configFile=TEST_CONFIG_FILE): diff --git a/bridgedb/test/moat_helpers.py b/bridgedb/test/moat_helpers.py index 8c40c82..236b529 100644 --- a/bridgedb/test/moat_helpers.py +++ b/bridgedb/test/moat_helpers.py @@ -48,7 +48,7 @@ MOAT_ROTATION_PERIOD = "3 hours" MOAT_GIMP_CAPTCHA_HMAC_KEYFILE = 'moat_captcha_hmac_key' MOAT_GIMP_CAPTCHA_RSA_KEYFILE = 'moat_captcha_rsa_key' -TEST_CONFIG_FILE = io.StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO("""\ GIMP_CAPTCHA_DIR = %r SERVER_PUBLIC_FQDN = %r SUPPORTED_TRANSPORTS = %r @@ -88,7 +88,7 @@ MOAT_GIMP_CAPTCHA_RSA_KEYFILE = %r MOAT_N_IP_CLUSTERS, MOAT_ROTATION_PERIOD, MOAT_GIMP_CAPTCHA_HMAC_KEYFILE, - MOAT_GIMP_CAPTCHA_RSA_KEYFILE))) + MOAT_GIMP_CAPTCHA_RSA_KEYFILE)) def _createConfig(configFile=TEST_CONFIG_FILE): configuration = {} diff --git a/bridgedb/test/test_captcha.py b/bridgedb/test/test_captcha.py index 24a14a4..92cc716 100644 --- a/bridgedb/test/test_captcha.py +++ b/bridgedb/test/test_captcha.py @@ -291,7 +291,7 @@ class GimpCaptchaTests(unittest.TestCase): c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() - solution = unicode(c.answer) + solution = c.answer if isinstance(c.answer, str) else c.answer.decode('utf-8') self.assertEquals( c.check(challenge, solution, c.secretKey, c.hmacKey), True) diff --git a/bridgedb/test/test_email_dkim.py b/bridgedb/test/test_email_dkim.py index be34370..e8fe3f3 100644 --- a/bridgedb/test/test_email_dkim.py +++ b/bridgedb/test/test_email_dkim.py @@ -46,8 +46,8 @@ get bridges } def _createMessage(self, messageString): - """Create an ``rfc822.Message`` from a string.""" - messageIO = io.StringIO(unicode(messageString)) + """Create an ``email.message.Message`` from a string.""" + messageIO = io.StringIO(messageString if isinstance(messageString, str) else messageString.decode('utf-8')) return rfc822.Message(messageIO) def test_checkDKIM_good(self): diff --git a/bridgedb/test/test_email_templates.py b/bridgedb/test/test_email_templates.py index 8464fe9..4703019 100644 --- a/bridgedb/test/test_email_templates.py +++ b/bridgedb/test/test_email_templates.py @@ -27,7 +27,7 @@ class EmailTemplatesTests(unittest.TestCase): """Unittests for :func:`b.e.templates`.""" def setUp(self): - self.t = NullTranslations(StringIO(unicode('test'))) + self.t = NullTranslations(StringIO('test')) self.client = Address('blackhole(a)torproject.org') self.answer = 'obfs3 1.1.1.1:1111\nobfs3 2.2.2.2:2222' # This is the fingerprint of BridgeDB's offline, certification-only diff --git a/bridgedb/test/test_persistent.py b/bridgedb/test/test_persistent.py index 72b4b85..269cc86 100644 --- a/bridgedb/test/test_persistent.py +++ b/bridgedb/test/test_persistent.py @@ -33,9 +33,9 @@ from sure import the from sure import expect -TEST_CONFIG_FILE = io.StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO("""\ BRIDGE_FILES = ['bridge-descriptors', 'bridge-descriptors.new'] -LOGFILE = 'bridgedb.log'""")) +LOGFILE = 'bridgedb.log'""") class StateTest(unittest.TestCase): diff --git a/bridgedb/test/test_persistentSaveAndLoad.py b/bridgedb/test/test_persistentSaveAndLoad.py index 07ea73b..d01a536 100644 --- a/bridgedb/test/test_persistentSaveAndLoad.py +++ b/bridgedb/test/test_persistentSaveAndLoad.py @@ -28,9 +28,9 @@ from twisted.trial import unittest from bridgedb import persistent -TEST_CONFIG_FILE = io.StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO("""\ BRIDGE_FILES = ['bridge-descriptors', 'bridge-descriptors.new'] -LOGFILE = 'bridgedb.log'""")) +LOGFILE = 'bridgedb.log'""") class StateSaveAndLoadTests(unittest.TestCase): diff --git a/bridgedb/test/test_txrecaptcha.py b/bridgedb/test/test_txrecaptcha.py index 22505b9..fd7365f 100644 --- a/bridgedb/test/test_txrecaptcha.py +++ b/bridgedb/test/test_txrecaptcha.py @@ -270,7 +270,7 @@ class MiscTests(unittest.TestCase): """:func:`txrecapcha._encodeIfNecessary` should convert unicode objects into strings. """ - origString = unicode('abc') + origString = 'abc' self.assertIsInstance(origString, unicode) newString = txrecaptcha._encodeIfNecessary(origString) self.assertIsInstance(newString, str)

1 0

[bridgedb/develop] Fix next item iteration
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit bd2ee8d0fca1ab311f9644ff826a430b30234453 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 16:26:19 2020 -0800 Fix next item iteration Python 3.x replaced the generator's next() method with a next() builtin... https://stackoverflow.com/questions/21622193/python-3-2-coroutine-attribute… No significant difference in test outcome... before: FAILED (skips=106, failures=16, errors=273, successes=409) after: FAILED (skips=106, failures=16, errors=272, successes=410) --- bridgedb/Storage.py | 2 +- bridgedb/test/test_parse_addr.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bridgedb/Storage.py b/bridgedb/Storage.py index c7385ba..9e2be8e 100644 --- a/bridgedb/Storage.py +++ b/bridgedb/Storage.py @@ -362,7 +362,7 @@ class DBGeneratorContextManager(_GeneratorContextManager): """ if type is None: try: - self.gen.next() + next(self.gen) except StopIteration: return return diff --git a/bridgedb/test/test_parse_addr.py b/bridgedb/test/test_parse_addr.py index 8183167..41cbb94 100644 --- a/bridgedb/test/test_parse_addr.py +++ b/bridgedb/test/test_parse_addr.py @@ -700,7 +700,7 @@ class PortListTest(unittest.TestCase): portList = addr.PortList(*ports) iterator = iter(portList) for x in range(len(ports)): - self.assertIn(iterator.next(), portList) + self.assertIn(next(iterator), portList) def test_str(self): """Test creating a :class:`addr.PortList` with valid ports.

1 0

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

19 Feb '20

commit 2e9a582e7124462d297bceb352dc179a64ca0639 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 13 17:49:50 2020 -0800 Fix translation tests Adjustments so test_translations.py passes. There were a few issues, most notably... * Python's map() builtin returns a list in 2.x and generator in 3.x. Generators are more efficient to work with, but when indexing into the object we must first convert it into a list. Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_translations.py", line 48, in test_getLocaleFromHTTPRequest_withLangParam self.assertEqual(parsed[0], 'ar') builtins.TypeError: 'map' object is not subscriptable * BridgeDB's getFirstSupportedLang returns 'en-US' by default when no supported language is present. That isn't a language due to its '-US' suffix, causing the following... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_translations.py", line 85, in test_usingRTLLang self.assertTrue(translations.usingRTLLang(['fa'])) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/translations.py", line 150, in usingRTLLang print("text_direction: %s" % babel.core.Locale.parse(lang).text_direction) File "/usr/local/lib/python3.5/dist-packages/babel/core.py", line 268, in parse parts = parse_locale(identifier, sep=sep) File "/usr/local/lib/python3.5/dist-packages/babel/core.py", line 1094, in parse_locale raise ValueError('expected only letters, got %r' % lang) builtins.ValueError: expected only letters, got 'en-us' * Test expects 'fa' to be a supported language. BridgeDB's "_langs.get_langs()" returns an empty list for me. Possibly a setup issue, but even if it was this should better explain what the test needs. Skipping this assertion if setup didn't enable farsi. Test results changed as follows... before: FAILED (skips=106, failures=17, errors=258, successes=423) after: FAILED (skips=106, failures=17, errors=256, successes=425) --- bridgedb/test/test_translations.py | 12 ++++++++---- bridgedb/translations.py | 19 +++++++++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/bridgedb/test/test_translations.py b/bridgedb/test/test_translations.py index 7d14cc0..939511d 100644 --- a/bridgedb/test/test_translations.py +++ b/bridgedb/test/test_translations.py @@ -10,7 +10,7 @@ from twisted.trial import unittest -from bridgedb import translations +from bridgedb import _langs, translations from bridgedb.test.https_helpers import DummyRequest @@ -45,10 +45,11 @@ class TranslationsMiscTests(unittest.TestCase): }) parsed = translations.getLocaleFromHTTPRequest(request) + + self.assertEqual(len(parsed), 3) self.assertEqual(parsed[0], 'ar') self.assertEqual(parsed[1], 'en') self.assertEqual(parsed[2], 'en_US') - self.assertEqual(len(parsed), 3) def test_getLocaleFromHTTPRequest_withLangParam_AcceptLanguage(self): """This request uses a '?lang=ar' param, with an 'Accept-Language' @@ -61,11 +62,12 @@ class TranslationsMiscTests(unittest.TestCase): request.args.update({b'lang': [b'fa']}) parsed = translations.getLocaleFromHTTPRequest(request) + + self.assertEqual(len(parsed), 3) self.assertEqual(parsed[0], 'fa') self.assertEqual(parsed[1], 'en') self.assertEqual(parsed[2], 'en_US') #self.assertEqual(parsed[3], 'en-gb') - self.assertEqual(len(parsed), 3) def test_getLocaleFromPlusAddr(self): emailAddr = 'bridges(a)torproject.org' @@ -80,4 +82,6 @@ class TranslationsMiscTests(unittest.TestCase): def test_usingRTLLang(self): self.assertFalse(translations.usingRTLLang(['foo_BAR'])) self.assertFalse(translations.usingRTLLang(['en'])) - self.assertTrue(translations.usingRTLLang(['fa'])) + + if 'fa' in _langs.get_langs(): + self.assertTrue(translations.usingRTLLang(['fa'])) diff --git a/bridgedb/translations.py b/bridgedb/translations.py index 10c27fc..194fa8a 100644 --- a/bridgedb/translations.py +++ b/bridgedb/translations.py @@ -58,7 +58,10 @@ def getFirstSupportedLang(langs): if l in supported: lang = l break - return lang + + # crop locales (like 'en-US') to just the language + + return lang.split('-')[0] def getLocaleFromHTTPRequest(request): """Retrieve the languages from an HTTP ``Accept-Language:`` header. @@ -77,16 +80,20 @@ def getLocaleFromHTTPRequest(request): logging.debug("Client sent no 'Accept-Language' header. Using fallback.") header = 'en,en-US' - langs = headers.parseAcceptLanguage(header) + langs = list(headers.parseAcceptLanguage(header)) if not safelog.safe_logging: # pragma: no cover logging.debug("Client Accept-Language (top 5): %s" % langs[:5]) # Check if we got a ?lang=foo argument, and if we did, insert it first - chosenLang = request.args.get("lang", [None,])[0] + chosenLang = request.args.get(b"lang", [None,])[0] if chosenLang: logging.debug("Client requested language: %r" % chosenLang) langs.insert(0, chosenLang) + # normalize languages to be unicode + + langs = list(map(lambda l: l if isinstance(l, str) else l.decode('utf-8'), langs)) + installTranslations(langs) return langs @@ -140,11 +147,11 @@ def usingRTLLang(langs): :returns: ``True`` if the preferred language is right-to-left; ``False`` otherwise. """ + lang = getFirstSupportedLang(langs) - rtl = False try: - rtl = babel.core.Locale.parse(lang).text_direction == "rtl" + return babel.core.Locale.parse(lang).text_direction == "rtl" except ValueError as err: logging.warning("Couldn't parse locale %s: %s" % (lang, err)) - return rtl + return False

1 0

[bridgedb/develop] Fix context manager creation
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit c1a48d1b568b00fab19a308e6497881f31d17680 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 16:38:25 2020 -0800 Fix context manager creation BridgeDB subclassed a GeneratorContextManager class which became private in python 3.x. Its constructor signature changed, so attempting to simply use the private version failed with... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_Storage.py", line 76, in test_insertBridgeAndGetRing_already_seen_bridge with Storage.getDB() as db: File "/home/atagar/Desktop/tor/bridgedb/bridgedb/Storage.py", line 400, in helper return DBGeneratorContextManager(func(*args, **kwds)) builtins.TypeError: __init__() missing 2 required positional arguments: 'args' and 'kwds' Storage.py is pretty confusing, but they seem to simply want a context manager so simply implementing one. This changes the test results as follows... before: FAILED (skips=106, failures=16, errors=272, successes=410) after: FAILED (skips=106, failures=17, errors=266, successes=415) --- bridgedb/Storage.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bridgedb/Storage.py b/bridgedb/Storage.py index 9e2be8e..1f81052 100644 --- a/bridgedb/Storage.py +++ b/bridgedb/Storage.py @@ -8,7 +8,6 @@ import binascii import sqlite3 import time import hashlib -from contextlib import _GeneratorContextManager from functools import wraps from ipaddr import IPAddress import sys @@ -345,11 +344,18 @@ def openDatabase(sqlite_file): return conn -class DBGeneratorContextManager(_GeneratorContextManager): +class DBGeneratorContextManager(object): """Helper for @contextmanager decorator. Overload __exit__() so we can call the generator many times """ + + def __init__(self, gen): + self.gen = gen + + def __enter__(self): + return next(self.gen) + def __exit__(self, type, value, traceback): """Handle exiting a with statement block

1 0

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

19 Feb '20

commit 6ec43aeb660d7e51e5fc6ba392f96172510e5ac0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 14:05:50 2020 -0800 Fix queue import Python 3.x changed its queue module name. 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 "./bridgedb/test/test_smtp.py", line 8, in <module> import Queue builtins.ImportError: No module named 'Queue' This changes test results as follows... before: FAILED (skips=103, failures=6, errors=183, successes=375) after: FAILED (skips=106, failures=6, errors=182, successes=375) --- bridgedb/test/test_smtp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bridgedb/test/test_smtp.py b/bridgedb/test/test_smtp.py index de443b3..2a532b2 100644 --- a/bridgedb/test/test_smtp.py +++ b/bridgedb/test/test_smtp.py @@ -5,7 +5,7 @@ from __future__ import print_function import smtplib import asyncore import threading -import Queue +import queue import random import os @@ -58,7 +58,7 @@ class EmailServer(SMTPServer): self.close() def start(self): - self.message_queue = Queue.Queue() + self.message_queue = queue.Queue() self._stop = threading.Event() self._thread = threading.Thread(target=self.thread_proc) # Ensures that if any tests do fail, then threads will exit when the @@ -93,7 +93,7 @@ class EmailServer(SMTPServer): # failures: # # https://travis-ci.org/isislovecruft/bridgedb/jobs/58996136#L3281 - except Queue.Empty: + except queue.Empty: pass else: assert message.find(text) != -1, ("Message did not contain text '%s'." @@ -103,7 +103,7 @@ class EmailServer(SMTPServer): def checkNoMessageReceived(self, timeoutInSecs=2.0): try: self.message_queue.get(block=True, timeout=timeoutInSecs) - except Queue.Empty: + except queue.Empty: return True assert False, "Found a message in the queue, but expected none"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2020