July 2015 - tor-commits - lists.torproject.org

[bridgedb/master] Merge branch 'translations/2015-07-25-update' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 617aa1bafd9bed8a18eb390cf72f51c4bd96c555 Merge: d05744c 8c5c789 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 25 03:43:56 2015 +0000 Merge branch 'translations/2015-07-25-update' into develop bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 82 ++++-- bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 71 ++--- bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 78 ++++-- bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 32 ++- bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 48 ++-- bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 29 +- bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 35 +-- bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 29 +- bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 32 ++- bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 73 ++--- bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 36 +-- bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 29 +- bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 29 +- bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 392 +++++++++++++++++++++++---- bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 33 +-- bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 78 ++++-- bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 78 ++++-- bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 39 +-- bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 32 ++- bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 32 ++- bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 32 ++- bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 33 +-- bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 145 ++++++---- bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 34 +-- bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 78 ++++-- bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 29 +- bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po | 383 ++++++++++++++++++++++++++ bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 32 ++- bridgedb/i18n/templates/bridgedb.pot | 46 ++-- bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 73 ++--- bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 32 ++- bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 49 ++-- bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 54 +++- 33 files changed, 1596 insertions(+), 711 deletions(-)

1 0

[bridgedb/master] Update get-completed-translations script with directory layout changes.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit abece06f8ecb623eb07589c558d6259611c6cd3b Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 25 03:45:27 2015 +0000 Update get-completed-translations script with directory layout changes. --- maint/get-completed-translations | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/maint/get-completed-translations b/maint/get-completed-translations index beac4c9..e09e28a 100755 --- a/maint/get-completed-translations +++ b/maint/get-completed-translations @@ -20,19 +20,18 @@ # # …/parentdir/ # |-- bridgedb/ -# | |-- lib/ -# | | `-- bridgedb/ -# | | `-- i18n/ -# | | |-- ar/ -# | | | `-- LC_MESSAGES -# | | | |-- bridgedb.mo -# | | | `-- bridgedb.po -# | | |-- … -# | | |-- zh_CN/ -# | | | `-- LC_MESSAGES -# | | | |-- bridgedb.mo -# | | | `-- bridgedb.po -# | | `-- templates/ +# | |`-- bridgedb/ +# | | `-- i18n/ +# | | |-- ar/ +# | | | `-- LC_MESSAGES +# | | | |-- bridgedb.mo +# | | | `-- bridgedb.po +# | | |-- … +# | | |-- zh_CN/ +# | | | `-- LC_MESSAGES +# | | | |-- bridgedb.mo +# | | | `-- bridgedb.po +# | | `-- templates/ # | |-- scripts/ # | `-- … # `-- bridgedb-translations/ @@ -138,7 +137,7 @@ cd $PARENT_PATH rsync -PCAXvrq \ --filter 'include *bridgedb.po' \ --filter 'exclude .gitignore' \ - $TRANS_DIR/* ./bridgedb/lib/bridgedb/i18n/ + $TRANS_DIR/* ./bridgedb/bridgedb/i18n/ status=$? printf "\n"

1 0

[bridgedb/master] Define IBridge interface for sufficiently "bridge-like" things.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 910941c712f20816c70e06e64add5e8530218c1c Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 9 00:16:37 2015 +0000 Define IBridge interface for sufficiently "bridge-like" things. * ADD bridgedb.bridges.IBridge interface specification. * CHANGE the following classes to declare that they implement the IBridge interface: - bridgedb.bridges.BridgeAddressBase - bridgedb.bridges.PluggableTransport - bridgedb.bridges.BridgeBase - bridgedb.bridges.BridgeBackwardsCompatibility - bridgedb.bridges.Bridge Conflicts: lib/bridgedb/bridges.py --- lib/bridgedb/bridges.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 5093bef..747863a 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -23,6 +23,10 @@ from Crypto.Util import asn1 from Crypto.Util.number import bytes_to_long from Crypto.Util.number import long_to_bytes +from zope.interface import implementer +from zope.interface import Attribute +from zope.interface import Interface + import bridgedb.Storage from bridgedb import geo @@ -78,6 +82,18 @@ class InvalidExtraInfoSignature(MalformedBridgeInfo): """Raised if the signature on an ``@type bridge-extrainfo`` is invalid.""" +class IBridge(Interface): + """I am a (mostly) stub interface whose primary purpose is merely to allow + other classes to signify whether or not they can be treated like a + :class:`Bridge`. + """ + fingerprint = Attribute( + ("The lowercased, hexadecimal-encoded, hash digest of this Bridge's " + "public identity key.")) + address = Attribute("This Bridge's primary public IP address.") + port = Attribute("The port which this Bridge is listening on.") + + class Flags(object): """All the flags which a :class:`Bridge` may have.""" @@ -122,6 +138,7 @@ class Flags(object): self.valid = 'Valid' in flags +@implementer(IBridge) class BridgeAddressBase(object): """A base class for describing one of a :class:`Bridge`'s or a :class:`PluggableTransport`'s location, including its identity key @@ -274,6 +291,8 @@ class BridgeAddressBase(object): self._port = None + +@implementer(IBridge) class PluggableTransport(BridgeAddressBase): """A single instance of a Pluggable Transport (PT) offered by a :class:`Bridge`. @@ -589,6 +608,7 @@ class PluggableTransport(BridgeAddressBase): self._runChecks() +@implementer(IBridge) class BridgeBase(BridgeAddressBase): """The base class for all bridge implementations.""" @@ -652,6 +672,7 @@ class BridgeBase(BridgeAddressBase): del self.port +@implementer(IBridge) class BridgeBackwardsCompatibility(BridgeBase): """Backwards compatibility methods for the old Bridge class.""" @@ -841,6 +862,7 @@ class BridgeBackwardsCompatibility(BridgeBase): return db.getBridgeHistory(self.fingerprint).weightedUptime +@implementer(IBridge) class Bridge(BridgeBackwardsCompatibility): """A single bridge, and all the information we have for it.

1 0

[bridgedb/master] Add a utility for registering interface adapter classes.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit ab5c6b01c2c0dc461d45899105a0e6892e682ef7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 11 02:01:45 2015 +0000 Add a utility for registering interface adapter classes. --- lib/bridgedb/util.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 7f906d7..f15e08b 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -19,6 +19,8 @@ import logging.config import logging.handlers import os +from twisted.python import components + def _getLogHandlers(logToFile=True, logToStderr=True): """Get the appropriate list of log handlers. @@ -245,6 +247,20 @@ def replaceControlChars(text, replacement=None, encoding="utf-8"): return str(escaped) +def registerAdapter(adapter, adapted, interface): + """Register a Zope interface adapter for global use. + + See :api:`twisted.python.components.registerAdapter` and the Twisted + Matrix Labs `howto documentation for components`_. + + .. howto documentation for components: + https://twistedmatrix.com/documents/current/core/howto/components.html + """ + try: + components.registerAdapter(adapter, adapted, interface) + except ValueError: # An adapter class was already registered + pass + class JustifiedLogFormatter(logging.Formatter): """A logging formatter which pretty prints thread and calling function

1 0

[bridgedb/master] Declare that b.test.util.DummyBridge and decendents implement IBridge.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 8d4bb32e075b806e7e99faa07e41f79701f47d93 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 9 00:19:49 2015 +0000 Declare that b.test.util.DummyBridge and decendents implement IBridge. This allows for more accurate (but still mocked) testing of anything that has conditional treatment of implementers/providers of IBridge. * CHANGE bridgedb.test.util.DummyBridge and DummyMaliciousBridge to declare that they both implement the IBridge interface. Conflicts: lib/bridgedb/test/util.py --- lib/bridgedb/test/util.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 500bbb8..0f1e0f9 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -25,8 +25,11 @@ from functools import wraps from twisted.trial import unittest from bridgedb import util as bdbutil +from bridgedb.bridges import IBridge from bridgedb.parse.addr import isIPAddress +from zope.interface import implementer + def fileCheckDecorator(func): """Method decorator for a t.t.unittest.TestCase test_* method. @@ -248,6 +251,7 @@ class Benchmarker(object): print("Benchmark: %12fms %12fs" % (self.milliseconds, self.seconds)) +@implementer(IBridge) class DummyBridge(object): """A mock :class:`bridgedb.bridges.Bridge` which only supports a mocked ``getBridgeLine`` method.""" @@ -284,6 +288,7 @@ class DummyBridge(object): return " ".join([item for item in line]) +@implementer(IBridge) class DummyMaliciousBridge(DummyBridge): """A mock :class:`bridgedb.Bridges.Bridge` which only supports a mocked ``getConfigLine`` method and which maliciously insert an additional fake

1 0

[bridgedb/master] Make the @port property common to both PluggableTransports and Bridges.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 63bc3924096d0cde3373e37d85ca1101e2fb438e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 9 00:08:04 2015 +0000 Make the @port property common to both PluggableTransports and Bridges. Because it seems awkward to require doing type checks in order to know which port a bridge-like thing is listening on. That is, previously, we could access PluggableTransport.port and Bridge.orPort, but *not* Bridge.port. Moving the port @property from the PluggableTransport class to the BridgeAddressBase class (and updating the Bridge.orPort @property to point at the port @property) allows us to access the port property of either one without caring which type it is. In addition to allowing us to forego type checks, this allow allows us to define an interface which essentially says that "a bridge-like thing is a thing which has a fingerprint, address, and a port", which again allows us to generalise code to deal with "bridge-like" things, rather than dealing with a tuple of classes which happen to be considered "bridge-like" at the time of writing. * MOVE the port @property from the PluggableTransport class to the BridgeAddressBase class. * CHANGE the Bridge.orPort @property to point at the new port @property. --- lib/bridgedb/bridges.py | 65 +++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index f56b0e7..5093bef 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -141,12 +141,17 @@ class BridgeAddressBase(object): :type country: str :ivar country: The two-letter GeoIP country code of the :ivar:`address`. + + :type port: int + :ivar port: A integer specifying the port which this :class:`Bridge` + (or :class:`PluggableTransport`) is listening on. """ def __init__(self): self._fingerprint = None self._address = None self._country = None + self._port = None @property def fingerprint(self): @@ -242,6 +247,32 @@ class BridgeAddressBase(object): if self.address: return geo.getCountryCode(self.address) + @property + def port(self): + """Get the port number which this ``Bridge`` is listening + for incoming client connections on. + + :rtype: int or None + :returns: The port (as an int), if it is known and valid; otherwise, + returns ``None``. + """ + return self._port + + @port.setter + def port(self, value): + """Store the port number which this ``Bridge`` is listening + for incoming client connections on. + + :param int value: The transport's port. + """ + if isinstance(value, int) and (0 <= value <= 65535): + self._port = value + + @port.deleter + def port(self): + """Reset this ``Bridge``'s port to ``None``.""" + self._port = None + class PluggableTransport(BridgeAddressBase): """A single instance of a Pluggable Transport (PT) offered by a @@ -314,7 +345,6 @@ class PluggableTransport(BridgeAddressBase): :data:`arguments`. """ super(PluggableTransport, self).__init__() - self._port = None self._methodname = None self._blockedIn = {} @@ -438,32 +468,6 @@ class PluggableTransport(BridgeAddressBase): return False @property - def port(self): - """Get the port number which this ``PluggableTransport`` is listening - for incoming client connections on. - - :rtype: int or None - :returns: The port (as an int), if it is known and valid; otherwise, - returns ``None``. - """ - return self._port - - @port.setter - def port(self, value): - """Store the port number which this ``PluggableTransport`` is listening - for incoming client connections on. - - :param int value: The transport's port. - """ - if isinstance(value, int) and (0 <= value <= 65535): - self._port = value - - @port.deleter - def port(self): - """Reset this ``PluggableTransport``'s port to ``None``.""" - self._port = None - - @property def methodname(self): """Get this :class:`PluggableTransport`'s methodname. @@ -632,7 +636,7 @@ class BridgeBase(BridgeAddressBase): :rtype: int :returns: This Bridge's default ORPort. """ - return self._orPort + return self.port @orPort.setter def orPort(self, value): @@ -640,13 +644,12 @@ class BridgeBase(BridgeAddressBase): :param int value: The Bridge's ORPort. """ - if isinstance(value, int) and (0 <= value <= 65535): - self._orPort = value + self.port = value @orPort.deleter def orPort(self): """Reset this Bridge's ORPort.""" - self._orPort = None + del self.port class BridgeBackwardsCompatibility(BridgeBase):

1 0

[bridgedb/master] Merge branch 'fix/12029-distribute-module' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 4ebb7842a53b513996604b3a8442fc0c5fc0e3fd Merge: 5019761 8d4bb32 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 25 03:24:18 2015 +0000 Merge branch 'fix/12029-distribute-module' into develop doc/sphinx/source/bridgedb.Dist.rst | 8 - doc/sphinx/source/bridgedb.Filters.rst | 8 - doc/sphinx/source/bridgedb.email.rst | 1 + doc/sphinx/source/bridgedb.filters.rst | 8 + doc/sphinx/source/bridgedb.https.rst | 1 + doc/sphinx/source/bridgedb.rst | 3 +- doc/sphinx/source/conf.py | 5 +- lib/bridgedb/Bridges.py | 101 +++-- lib/bridgedb/Dist.py | 559 ------------------------- lib/bridgedb/Filters.py | 116 ----- lib/bridgedb/Main.py | 36 +- lib/bridgedb/bridgerequest.py | 77 ++-- lib/bridgedb/bridges.py | 115 +++-- lib/bridgedb/distribute.py | 275 ++++++++++++ lib/bridgedb/email/autoresponder.py | 13 +- lib/bridgedb/email/distributor.py | 219 ++++++++++ lib/bridgedb/email/request.py | 6 +- lib/bridgedb/email/server.py | 4 +- lib/bridgedb/email/templates.py | 2 +- lib/bridgedb/filters.py | 238 +++++++++++ lib/bridgedb/https/distributor.py | 328 +++++++++++++++ lib/bridgedb/https/request.py | 2 +- lib/bridgedb/https/server.py | 6 +- lib/bridgedb/interfaces.py | 56 ++- lib/bridgedb/parse/addr.py | 13 +- lib/bridgedb/persistent.py | 16 +- lib/bridgedb/test/email_helpers.py | 24 +- lib/bridgedb/test/https_helpers.py | 6 +- lib/bridgedb/test/legacy_Tests.py | 301 +------------ lib/bridgedb/test/test_Dist.py | 239 ----------- lib/bridgedb/test/test_Main.py | 6 +- lib/bridgedb/test/test_bridges.py | 10 +- lib/bridgedb/test/test_distribute.py | 44 ++ lib/bridgedb/test/test_email_autoresponder.py | 2 +- lib/bridgedb/test/test_email_distributor.py | 258 ++++++++++++ lib/bridgedb/test/test_email_request.py | 16 +- lib/bridgedb/test/test_email_server.py | 6 +- lib/bridgedb/test/test_filters.py | 333 +++++++++++++++ lib/bridgedb/test/test_https_distributor.py | 405 ++++++++++++++++++ lib/bridgedb/test/test_https_server.py | 2 +- lib/bridgedb/test/test_interfaces.py | 55 +++ lib/bridgedb/test/util.py | 48 ++- lib/bridgedb/util.py | 16 + 43 files changed, 2561 insertions(+), 1426 deletions(-)

1 0

[bridgedb/master] Merge branch 'hotfix/0.3.2-pep440' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 300bc1110c686285080d4e5e162d7fdcc9dc6480 Merge: 8bf4f5f 6fb22aa Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 25 06:43:43 2015 +0000 Merge branch 'hotfix/0.3.2-pep440' into develop MANIFEST.in | 2 + bridgedb/_version.py | 551 ++++++++++---- setup.cfg | 21 + setup.py | 18 - versioneer.py | 2045 +++++++++++++++++++++++++++++++++++++------------- 5 files changed, 1974 insertions(+), 663 deletions(-)

1 0

[bridgedb/master] Change BridgeRequestBase.addressClass → BridgeRequestBase.ipVersion.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 9c34acd384a57f23f451142978b0fdbc4694dc72 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 11 01:04:42 2015 +0000 Change BridgeRequestBase.addressClass → BridgeRequestBase.ipVersion. Passing an integer around both requires less memory, and makes the IP version filters in bridgedb.filters run faster (since they no longer need to use isinstance()). * CHANGE bridgedb.bridges.Bridge to use ipVersion when working with BridgeRequestBase. --- lib/bridgedb/bridgerequest.py | 57 ++++++++++++++++++------------- lib/bridgedb/bridges.py | 12 +++---- lib/bridgedb/filters.py | 4 +-- lib/bridgedb/test/test_email_request.py | 16 ++++----- lib/bridgedb/test/util.py | 2 +- 5 files changed, 51 insertions(+), 40 deletions(-) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index 2ded7b3..1266145 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -27,10 +27,10 @@ from bridgedb.filters import byTransport class IRequestBridges(Interface): """Interface specification of client options for requested bridges.""" - addressClass = Attribute( - "The IP version of bridge addresses to distribute to the client.") filters = Attribute( "A list of callables used to filter bridges from a hashring.") + ipVersion = Attribute( + "The IP version of bridge addresses to distribute to the client.") transports = Attribute( "A list of strings of Pluggable Transport types requested.") notBlockedIn = Attribute( @@ -54,7 +54,7 @@ class IRequestBridges(Interface): def generateFilters(): """Build the list of callables, ``filters``, according to the current contents of the lists of ``transports``, ``notBlockedIn``, and the - ``addressClass``. + ``ipVersion``. """ def getHashringPlacement(): @@ -68,10 +68,10 @@ class IRequestBridges(Interface): """Determine if the request is ``valid`` according to some parameters.""" def withIPv4(): - """Set the ``addressClass`` to IPv4.""" + """Set the ``ipVersion`` to IPv4.""" def withIPv6(): - """Set the ``addressClass`` to IPv6.""" + """Set the ``ipVersion`` to IPv6.""" def withPluggableTransportType(typeOfPT): """Add this **typeOfPT** to the list of requested ``transports``.""" @@ -87,13 +87,8 @@ class BridgeRequestBase(object): implements(IRequestBridges) - def __init__(self, addressClass=None): - #: (:class:`ipaddr.IPv4Address` or :class:`ipaddr.IPv6Address`) The IP - #: version of bridge addresses to distribute to the client. - self.addressClass = addressClass - if not ((self.addressClass is ipaddr.IPv4Address) or - (self.addressClass is ipaddr.IPv6Address)): - self.addressClass = ipaddr.IPv4Address + def __init__(self, ipVersion=None): + self.ipVersion = ipVersion #: (list) A list of callables used to filter bridges from a hashring. self.filters = list() #: (list) A list of strings of Pluggable Transport types requested. @@ -110,6 +105,26 @@ class BridgeRequestBase(object): #: (bool) Should be ``True`` if the client's request was valid. self.valid = False + @property + def ipVersion(self): + """The IP version of bridge addresses to distribute to the client. + + :rtype: int + :returns: Either ``4`` or ``6``. + """ + return self._ipVersion + + @ipVersion.setter + def ipVersion(self, ipVersion): + """The IP version of bridge addresses to distribute to the client. + + :param int ipVersion: The IP address version for the bridge lines we + should distribute in response to this client request. + """ + if not ipVersion in (4, 6): + ipVersion = 4 + self._ipVersion = ipVersion + def getHashringPlacement(self, key, client=None): """Create an HMAC of some **client** info using a **key**. @@ -145,10 +160,10 @@ class BridgeRequestBase(object): return self.valid def withIPv4(self): - self.addressClass = ipaddr.IPv4Address + self.ipVersion = 4 def withIPv6(self): - self.addressClass = ipaddr.IPv6Address + self.ipVersion = 6 def withoutBlockInCountry(self, country): self.notBlockedIn.append(country.lower()) @@ -175,21 +190,17 @@ class BridgeRequestBase(object): self.clearFilters() pt = self.justOnePTType() - msg = ("Adding a filter to %s for %s for IPv%s" - % (self.__class__.__name__, self.client, self.addressClass)) - - self.ipVersion = 4 - if self.addressClass is ipaddr.IPv6Address: - self.ipVersion = 6 + msg = ("Adding a filter to %s for %s for IPv%d" + % (self.__class__.__name__, self.client, self.ipVersion)) if self.notBlockedIn: for country in self.notBlockedIn: logging.info("%s %s bridges not blocked in %s..." % (msg, pt or "vanilla", country)) - self.addFilter(byNotBlockedIn(country, pt, self.addressClass)) + self.addFilter(byNotBlockedIn(country, pt, self.ipVersion)) elif pt: logging.info("%s %s bridges..." % (msg, pt)) - self.addFilter(byTransport(pt, self.addressClass)) + self.addFilter(byTransport(pt, self.ipVersion)) else: logging.info("%s bridges..." % msg) - self.addFilter(byIPv(self.addressClass)) + self.addFilter(byIPv(self.ipVersion)) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index f6e1d6b..f56b0e7 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -785,7 +785,8 @@ class BridgeBackwardsCompatibility(BridgeBase): :data:`bridgerequest.BridgeRequestBase.client`. :param str transport: A pluggable transport method name. """ - bridgeRequest = bridgerequest.BridgeRequestBase(addressClass) + ipVersion = 6 if addressClass is ipaddr.IPv6Address else 4 + bridgeRequest = bridgerequest.BridgeRequestBase(ipVersion) bridgeRequest.client = request if request else bridgeRequest.client bridgeRequest.isValid(True) @@ -1087,7 +1088,7 @@ class Bridge(BridgeBackwardsCompatibility): type. """ desired = bridgeRequest.justOnePTType() - addressClass = bridgeRequest.addressClass + ipVersion = bridgeRequest.ipVersion logging.info("Bridge %s answering request for %s transport..." % (self, desired)) @@ -1096,8 +1097,7 @@ class Bridge(BridgeBackwardsCompatibility): # their ``methodname`` matches the requested transport: transports = filter(lambda pt: pt.methodname == desired, self.transports) # Filter again for whichever of IPv4 or IPv6 was requested: - transports = filter(lambda pt: isinstance(pt.address, addressClass), - transports) + transports = filter(lambda pt: pt.address.version == ipVersion, transports) if not transports: raise PluggableTransportUnavailable( @@ -1136,13 +1136,13 @@ class Bridge(BridgeBackwardsCompatibility): """ logging.info( "Bridge %s answering request for IPv%s vanilla address..." % - (self, "6" if bridgeRequest.addressClass is ipaddr.IPv6Address else "4")) + (self, bridgeRequest.ipVersion)) addresses = [] for address, port, version in self.allVanillaAddresses: # Filter ``allVanillaAddresses`` by whether IPv4 or IPv6 was requested: - if isinstance(address, bridgeRequest.addressClass): + if version == bridgeRequest.ipVersion: # Determine if the address is blocked in any of the country # codes. Because :meth:`addressIsBlockedIn` returns a bool, # we get a list like: ``[True, False, False, True]``, and diff --git a/lib/bridgedb/filters.py b/lib/bridgedb/filters.py index 8843937..ca9b673 100644 --- a/lib/bridgedb/filters.py +++ b/lib/bridgedb/filters.py @@ -126,8 +126,8 @@ def byTransport(methodname=None, ipVersion=None): 1. The :data:`~bridge.bridges.PluggableTransport.methodname` matches **methodname**, and - 2. The :data:`~bridgedb.bridges.PluggableTransport.address`` is an - instance of **addressClass**. + 2. The :data:`~bridgedb.bridges.PluggableTransport.address`` version + matches the **ipVersion**. :param str methodname: A Pluggable Transport :data:`~bridge.bridges.PluggableTransport.methodname`. diff --git a/lib/bridgedb/test/test_email_request.py b/lib/bridgedb/test/test_email_request.py index 7e7f6ea..745ea71 100644 --- a/lib/bridgedb/test/test_email_request.py +++ b/lib/bridgedb/test/test_email_request.py @@ -55,7 +55,7 @@ class DetermineBridgeRequestOptionsTests(unittest.TestCase): self.assertEqual(reqvest.isValid(), False) self.assertFalse(reqvest.wantsKey()) # Though they did request IPv6, technically. - self.assertIs(reqvest.addressClass, ipaddr.IPv6Address) + self.assertIs(reqvest.ipVersion, 6) # And they did request a transport, technically. self.assertEqual(len(reqvest.transports), 1) self.assertEqual(reqvest.transports[0], 'obfs3') @@ -71,7 +71,7 @@ class DetermineBridgeRequestOptionsTests(unittest.TestCase): self.assertEqual(reqvest.isValid(), True) self.assertFalse(reqvest.wantsKey()) # Though they didn't request IPv6, so it should default to IPv4. - self.assertIs(reqvest.addressClass, ipaddr.IPv4Address) + self.assertIs(reqvest.ipVersion, 4) # And they requested two transports. self.assertEqual(len(reqvest.transports), 2) self.assertEqual(reqvest.transports[0], 'obfs3') @@ -93,7 +93,7 @@ class DetermineBridgeRequestOptionsTests(unittest.TestCase): self.assertEqual(reqvest.isValid(), True) self.assertFalse(reqvest.wantsKey()) # Though they didn't request IPv6, so it should default to IPv4. - self.assertIs(reqvest.addressClass, ipaddr.IPv4Address) + self.assertIs(reqvest.ipVersion, 4) # And they requested two transports. self.assertEqual(len(reqvest.transports), 2) self.assertEqual(reqvest.transports[0], 'obfs3') @@ -116,7 +116,7 @@ class DetermineBridgeRequestOptionsTests(unittest.TestCase): lines = ['', 'get ipv6'] reqvest = request.determineBridgeRequestOptions(lines) - self.assertIs(reqvest.addressClass, ipaddr.IPv6Address) + self.assertIs(reqvest.ipVersion, 6) self.assertEqual(reqvest.isValid(), True) @@ -128,7 +128,7 @@ class EmailBridgeRequestTests(unittest.TestCase): self.request = request.EmailBridgeRequest() def tearDown(self): - """Reset cached 'unblocked'/'transport' lists and addressClass between + """Reset cached 'unblocked'/'transport' lists and ipVersion between tests. """ self.request.withIPv4() @@ -174,10 +174,10 @@ class EmailBridgeRequestTests(unittest.TestCase): self.assertEqual(self.request.wantsKey(), False) def test_EmailBridgeRequest_withIPv6(self): - """IPv6 requests should have ``addressClass = ipaddr.IPv6Address``.""" - self.assertEqual(self.request.addressClass, ipaddr.IPv4Address) + """IPv6 requests should have ``ipVersion == 6``.""" + self.assertEqual(self.request.ipVersion, 4) self.request.withIPv6() - self.assertEqual(self.request.addressClass, ipaddr.IPv6Address) + self.assertEqual(self.request.ipVersion, 6) def test_EmailBridgeRequest_withoutBlockInCountry_CN(self): """Country codes that aren't lowercase should be ignored.""" diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 2cddc11..500bbb8 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -273,7 +273,7 @@ class DummyBridge(object): line = [] if bridgeRequest.transports: line.append(bridgeRequest.transports[-1]) # Just the last PT - if bridgeRequest.addressClass is ipaddr.IPv6Address: + if bridgeRequest.ipVersion is 6: line.append("[%s]:%s" % self.orAddresses[0][:2]) else: line.append("%s:%s" % (self.address, self.orPort))

1 0

[bridgedb/master] Switch to using relative imports for test helpers in test/tests_*.py.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 6d309cae1e709e615b592690f1a34369f60fa709 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 25 05:47:04 2015 +0000 Switch to using relative imports for test helpers in test/tests_*.py. --- bridgedb/util.py | 48 +++++++++++++++++++++----------------- test/email_helpers.py | 3 ++- test/https_helpers.py | 3 ++- test/legacy_Tests.py | 20 +++++++++------- test/test_Tests.py | 37 +++++++++++++++-------------- test/test_bridgedb.py | 4 ++-- test/test_bridges.py | 6 ++--- test/test_crypto.py | 5 ++-- test/test_email_autoresponder.py | 7 +++--- test/test_email_distributor.py | 3 ++- test/test_email_server.py | 7 +++--- test/test_https.py | 4 ++-- test/test_https_distributor.py | 7 +++--- test/test_https_server.py | 11 +++++---- test/test_parse_descriptors.py | 2 +- test/test_smtp.py | 4 ++-- test/test_translations.py | 2 +- test/util.py | 8 +++---- 18 files changed, 98 insertions(+), 83 deletions(-) diff --git a/bridgedb/util.py b/bridgedb/util.py index f15e08b..4c558c4 100644 --- a/bridgedb/util.py +++ b/bridgedb/util.py @@ -153,6 +153,7 @@ def levenshteinDistance(s1, s2, len1=None, len2=None, the number of characters which must be changed in **s1** to make it identical to **s2**. + >>> from bridgedb.util import levenshteinDistance >>> levenshteinDistance('cat', 'cat') 0 >>> levenshteinDistance('cat', 'hat') @@ -188,6 +189,7 @@ def isascii(s): Note that this function differs from the str.is* methods in that it returns True for the empty string, rather than False. + >>> from bridgedb.util import isascii >>> isascii('\x80') False >>> isascii('foo\tbar\rbaz\n') @@ -206,6 +208,7 @@ def isascii_noncontrol(s): Note that this function differs from the str.is* methods in that it returns True for the empty string, rather than False. + >>> from bridgedb.util import isascii_noncontrol >>> isascii_noncontrol('\x80') False >>> isascii_noncontrol('foo\tbar\rbaz\n') @@ -220,6 +223,7 @@ def isascii_noncontrol(s): def replaceControlChars(text, replacement=None, encoding="utf-8"): """Remove ASCII control characters [0-31, 92, 127]. + >>> from bridgedb.util import replaceControlChars >>> replaceControlChars('foo\n bar\\ baz\r \t\0quux\n') 'foo bar baz quux' >>> replaceControlChars("\bI wonder if I'm outside the quotes now") @@ -344,36 +348,36 @@ class mixin: >>> from bridgedb.util import mixin >>> >>> class ClassA(object): - >>> def sayWhich(self): - >>> print("ClassA.sayWhich() called.") - >>> def doSuperThing(self): - >>> super(ClassA, self).__repr__() - >>> def doThing(self): - >>> print("ClassA is doing a thing.") - >>> + ... def sayWhich(self): + ... print("ClassA.sayWhich() called.") + ... def doSuperThing(self): + ... print("%s" % super(ClassA, self)) + ... def doThing(self): + ... print("ClassA is doing a thing.") + ... >>> class ClassB(ClassA): - >>> def sayWhich(self): - >>> print("ClassB.sayWhich() called.") - >>> def doSuperThing(self): - >>> super(ClassB, self).__repr__() - >>> def doOtherThing(self): - >>> print("ClassB is doing something else.") - >>> + ... def sayWhich(self): + ... print("ClassB.sayWhich() called.") + ... def doSuperThing(self): + ... print("%s" % super(ClassB, self)) + ... def doOtherThing(self): + ... print("ClassB is doing something else.") + ... >>> class ClassM(mixin): - >>> def sayWhich(self): - >>> print("ClassM.sayWhich() called.") - >>> + ... def sayWhich(self): + ... print("ClassM.sayWhich() called.") + ... >>> ClassM.register(ClassA) >>> >>> class ClassC(ClassM, ClassB): - >>> def sayWhich(self): - >>> super(ClassC, self).sayWhich() - >>> + ... def sayWhich(self): + ... super(ClassC, self).sayWhich() + ... >>> c = ClassC() >>> c.sayWhich() - ClassM.saywhich() called. + ClassM.sayWhich() called. >>> c.doSuperThing() - <super: <class 'ClassA'>, NULL> + <super: <class 'ClassB'>, <ClassC object>> >>> c.doThing() ClassA is doing a thing. >>> c.doOtherThing() diff --git a/test/email_helpers.py b/test/email_helpers.py index 14c86f4..8d7dd49 100644 --- a/test/email_helpers.py +++ b/test/email_helpers.py @@ -18,7 +18,8 @@ from bridgedb.email.distributor import IgnoreEmail from bridgedb.email.distributor import TooSoonEmail from bridgedb.email.server import MailServerContext from bridgedb.schedule import Unscheduled -from bridgedb.test import util + +from . import util EMAIL_DIST = True diff --git a/test/https_helpers.py b/test/https_helpers.py index e2c94ba..3fb4887 100644 --- a/test/https_helpers.py +++ b/test/https_helpers.py @@ -15,9 +15,10 @@ import io from twisted.web.test import requesthelper -from bridgedb.test import util from bridgedb.persistent import Conf +from . import util + SERVER_PUBLIC_FQDN = 'bridges.torproject.org' SERVER_PUBLIC_EXTERNAL_IP = '38.229.72.19' diff --git a/test/legacy_Tests.py b/test/legacy_Tests.py index 40f7ae4..22b2e13 100644 --- a/test/legacy_Tests.py +++ b/test/legacy_Tests.py @@ -30,19 +30,21 @@ from bridgedb.email.distributor import EmailDistributor from bridgedb.email.distributor import IgnoreEmail from bridgedb.email.distributor import TooSoonEmail from bridgedb.parse import addr -from bridgedb.test.util import bracketIPv6 -from bridgedb.test.util import randomIP -from bridgedb.test.util import randomIPv4 -from bridgedb.test.util import randomIPv6 -from bridgedb.test.util import randomIPString -from bridgedb.test.util import randomIPv4String -from bridgedb.test.util import randomIPv6String -from bridgedb.test.util import randomPort -from bridgedb.test.util import randomValidIPv6 + +from .util import bracketIPv6 +from .util import randomIP +from .util import randomIPv4 +from .util import randomIPv6 +from .util import randomIPString +from .util import randomIPv4String +from .util import randomIPv6String +from .util import randomPort +from .util import randomValidIPv6 from math import log warnings.filterwarnings('ignore', '.*tmpnam.*') +warnings.filterwarnings('ignore', '.*Config.*') def randomPortSpec(): diff --git a/test/test_Tests.py b/test/test_Tests.py index 84c3f8b..9209245 100644 --- a/test/test_Tests.py +++ b/test/test_Tests.py @@ -4,13 +4,13 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013, Isis Lovecruft -# (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information -"""Class wrappers to adapt BridgeDB old unittests in :mod:`bridgedb.Tests` -(now kept in :mod:`bridgedb.test.legacy_Tests`) to be compatible with the +"""Class wrappers to adapt BridgeDB old unittests in ``bridgedb.Tests`` +(now kept in ``test/legacy_Tests``) to be compatible with the newer :api:`twisted.trial` unittests in this directory. """ @@ -22,16 +22,17 @@ import doctest import glob import logging import os -import warnings from twisted.python import monkey from twisted.trial import unittest -from bridgedb.test import legacy_Tests as Tests -from bridgedb.test import deprecated +from . import legacy_Tests as Tests +from . import deprecated + + +logging.disable(50) -warnings.filterwarnings('ignore', module="bridgedb\.test\.legacy_Tests") pyunit = __import__('unittest') @@ -64,16 +65,16 @@ def generateTrialAdaptedDoctestsSuite(): def monkeypatchTests(): """Monkeypatch the old unittests, replacing new, refactored code with their - original equivalents from :mod:`bridgedb.test.deprecated`. + original equivalents from :mod:`deprecated`. The first patch replaces the newer parsing function, :func:`~bridgedb.parse.networkstatus.parseALine`, with the older, - :func:`deprecated one <bridgedb.test.deprecated.parseORAddressLine>` (the + :func:`deprecated one <deprecated.parseORAddressLine>` (the old function was previously located at ``bridgedb.Bridges.parseORAddressLine``). The second patch replaces the new :class:`~bridgedb.parse.addr.PortList`, - with the :class:`older one <bridgedb.test.deprecated.PortList>` (which + with the :class:`older one <deprecated.PortList>` (which was previously located at ``bridgedb.Bridges.PortList``). The third, forth, and fifth monkeypatches add some module-level attributes @@ -81,7 +82,7 @@ def monkeypatchTests(): :rtype: :api:`~twisted.python.monkey.MonkeyPatcher` :returns: A :api:`~twisted.python.monkey.MonkeyPatcher`, preloaded with - patches from :mod:`bridgedb.test.deprecated`. + patches from :mod:`deprecated`. """ patcher = monkey.MonkeyPatcher() patcher.addPatch(Tests.bridgedb.Bridges, 'PluggableTransport', @@ -189,14 +190,14 @@ class DynamicTestCaseMeta(type): class OldUnittests(unittest.TestCase): - """A wrapper around :mod:`bridgedb.Tests` to produce :api:`~twisted.trial` + """A wrapper around :mod:`legacy_Tests` to produce :api:`~twisted.trial` compatible output. Generates a :api:`twisted.trial.unittest.TestCase` containing a - test for each of the individual tests in :mod:`bridgedb.Tests`. + test for each of the individual tests in :mod:`legacy_Tests`. Each test in this :api:`~twisted.trial.unittest.TestCase`` is dynamically - generated from one of the old unittests in :mod:`bridgedb.Tests`. Then, + generated from one of the old unittests in :mod:`legacy_Tests`. Then, the class is wrapped to cause the results reporting mechanisms to be :api:`~twisted.trial` compatible. @@ -209,13 +210,13 @@ class OldUnittests(unittest.TestCase): class MonkeypatchedOldUnittests(unittest.TestCase): - """A wrapper around :mod:`bridgedb.Tests` to produce :api:`~twisted.trial` + """A wrapper around :mod:`legacy_Tests` to produce :api:`~twisted.trial` compatible output. For each test in this ``TestCase``, one of the old unittests in bridgedb/Tests.py is run. For all of the tests, some functions and classes are :api:`twisted.python.monkey.MonkeyPatcher.patch`ed with old, - deprecated code from :mod:`bridgedb.test.deprecated` to ensure that any + deprecated code from :mod:`deprecated` to ensure that any new code has not caused any regressions. """ __metaclass__ = DynamicTestCaseMeta diff --git a/test/test_bridgedb.py b/test/test_bridgedb.py index 70c71f0..00c231b 100644 --- a/test/test_bridgedb.py +++ b/test/test_bridgedb.py @@ -21,8 +21,8 @@ from twisted.trial import unittest from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest -from bridgedb.test.util import processExists -from bridgedb.test.util import getBridgeDBPID +from .util import processExists +from .util import getBridgeDBPID class BridgeDBCliTest(unittest.TestCase): diff --git a/test/test_bridges.py b/test/test_bridges.py index db662ae..9448e3f 100644 --- a/test/test_bridges.py +++ b/test/test_bridges.py @@ -148,10 +148,10 @@ class BridgeIntegrationTests(unittest.TestCase): .. data: OldTest (enum) These tests were refactored from the old tests for - :class:`~bridgedb.test.deprecated.Bridge`, which lived in + ``deprecated.Bridge`, which lived in ``lib/bridgedb/test/test_Bridges.py``. For the translations from the old - tests in ``bridgedb.test.test_Bridges.BridgeClassTest`` to their new - equivalents here in ``bridgedb.test.test_bridges.BridgeIntegrationTests``, + tests in ``test_Bridges.BridgeClassTest`` to their new + equivalents here in ``test_bridges.BridgeIntegrationTests``, which should test for the same things as their old equivalents, see the following table: diff --git a/test/test_crypto.py b/test/test_crypto.py index 3264ace..5220a58 100644 --- a/test/test_crypto.py +++ b/test/test_crypto.py @@ -33,8 +33,9 @@ from twisted.web.test import test_agent as txtagent from bridgedb import crypto from bridgedb import txrecaptcha from bridgedb.persistent import Conf -from bridgedb.test.util import fileCheckDecorator -from bridgedb.test.email_helpers import _createConfig + +from .util import fileCheckDecorator +from .email_helpers import _createConfig logging.disable(50) diff --git a/test/test_email_autoresponder.py b/test/test_email_autoresponder.py index 98302ca..77fb77a 100644 --- a/test/test_email_autoresponder.py +++ b/test/test_email_autoresponder.py @@ -26,9 +26,10 @@ from twisted.test import proto_helpers from bridgedb.email import autoresponder from bridgedb.email.server import SMTPMessage from bridgedb.email.distributor import TooSoonEmail -from bridgedb.test.email_helpers import _createConfig -from bridgedb.test.email_helpers import _createMailServerContext -from bridgedb.test.email_helpers import DummyEmailDistributorWithState + +from .email_helpers import _createConfig +from .email_helpers import _createMailServerContext +from .email_helpers import DummyEmailDistributorWithState class CreateResponseBodyTests(unittest.TestCase): diff --git a/test/test_email_distributor.py b/test/test_email_distributor.py index b4d88b2..f204d57 100644 --- a/test/test_email_distributor.py +++ b/test/test_email_distributor.py @@ -28,7 +28,8 @@ from bridgedb.email.request import EmailBridgeRequest from bridgedb.parse.addr import BadEmail from bridgedb.parse.addr import UnsupportedDomain from bridgedb.parse.addr import normalizeEmail -from bridgedb.test.util import generateFakeBridges + +from .util import generateFakeBridges logging.disable(50) diff --git a/test/test_email_server.py b/test/test_email_server.py index 9c4fabb..3a3d62d 100644 --- a/test/test_email_server.py +++ b/test/test_email_server.py @@ -36,9 +36,10 @@ from bridgedb.email.distributor import EmailDistributor from bridgedb.email.distributor import TooSoonEmail from bridgedb.parse.addr import BadEmail from bridgedb.schedule import Unscheduled -from bridgedb.test import util -from bridgedb.test.email_helpers import _createConfig -from bridgedb.test.email_helpers import _createMailServerContext + +from . import util +from .email_helpers import _createConfig +from .email_helpers import _createMailServerContext class SMTPMessageTests(unittest.TestCase): diff --git a/test/test_https.py b/test/test_https.py index 1e0c778..8a5754f 100644 --- a/test/test_https.py +++ b/test/test_https.py @@ -35,8 +35,8 @@ from twisted.trial import unittest from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest -from bridgedb.test.util import processExists -from bridgedb.test.util import getBridgeDBPID +from .util import processExists +from .util import getBridgeDBPID HTTP_ROOT = 'http://127.0.0.1:6788' CAPTCHA_RESPONSE = 'Tvx74Pmy' diff --git a/test/test_https_distributor.py b/test/test_https_distributor.py index 83f2503..3c1416d 100644 --- a/test/test_https_distributor.py +++ b/test/test_https_distributor.py @@ -26,9 +26,10 @@ from bridgedb.filters import byIPv6 from bridgedb.https import distributor from bridgedb.https.request import HTTPSBridgeRequest from bridgedb.proxy import ProxySet -from bridgedb.test.util import randomValidIPv4String -from bridgedb.test.util import generateFakeBridges -from bridgedb.test.https_helpers import DummyRequest + +from .util import randomValidIPv4String +from .util import generateFakeBridges +from .https_helpers import DummyRequest logging.disable(50) diff --git a/test/test_https_server.py b/test/test_https_server.py index e782135..708f7e3 100644 --- a/test/test_https_server.py +++ b/test/test_https_server.py @@ -29,11 +29,12 @@ from twisted.web.test import requesthelper from bridgedb.https import server from bridgedb.schedule import ScheduledInterval -from bridgedb.test.https_helpers import _createConfig -from bridgedb.test.https_helpers import DummyRequest -from bridgedb.test.https_helpers import DummyHTTPSDistributor -from bridgedb.test.util import DummyBridge -from bridgedb.test.util import DummyMaliciousBridge + +from .https_helpers import _createConfig +from .https_helpers import DummyRequest +from .https_helpers import DummyHTTPSDistributor +from .util import DummyBridge +from .util import DummyMaliciousBridge # For additional logger output for debugging, comment out the following: diff --git a/test/test_parse_descriptors.py b/test/test_parse_descriptors.py index dd6d146..5104ccd 100644 --- a/test/test_parse_descriptors.py +++ b/test/test_parse_descriptors.py @@ -33,7 +33,7 @@ except (ImportError, NameError), error: else: HAS_STEM = True -from bridgedb.test.util import Benchmarker +from .util import Benchmarker BRIDGE_NETWORKSTATUS_0 = '''\ diff --git a/test/test_smtp.py b/test/test_smtp.py index de443b3..0ac4ada 100644 --- a/test/test_smtp.py +++ b/test/test_smtp.py @@ -15,8 +15,8 @@ from twisted.trial import unittest from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest -from bridgedb.test.util import processExists -from bridgedb.test.util import getBridgeDBPID +from .util import processExists +from .util import getBridgeDBPID # ------------- SMTP Client Config SMTP_DEBUG_LEVEL = 0 # set to 1 to see SMTP message exchange diff --git a/test/test_translations.py b/test/test_translations.py index 48229c6..c1f0c8c 100644 --- a/test/test_translations.py +++ b/test/test_translations.py @@ -11,7 +11,7 @@ from twisted.trial import unittest from bridgedb import translations -from bridgedb.test.test_https_server import DummyRequest +from .https_helpers import DummyRequest REALISH_HEADERS = { diff --git a/test/util.py b/test/util.py index 0f1e0f9..bd8227d 100644 --- a/test/util.py +++ b/test/util.py @@ -4,12 +4,12 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013, Isis Lovecruft -# (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information -"""Unittests utilitys the `bridgedb.test` package.""" +"""Unittest utilities.""" from __future__ import print_function from __future__ import unicode_literals

1 0