[tor-commits] [bridgedb/master] Fix broken relative imports due to upgrading Twisted.

isis at torproject.org isis at torproject.org
Sat Oct 28 00:29:39 UTC 2017


commit 92a79ac4d6ae0ba4f8bd213a8449742f641d7e4b
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Jul 25 22:22:28 2017 +0000

    Fix broken relative imports due to upgrading Twisted.
    
     * FIXES #23033
---
 bridgedb/test/test_Tests.py               |  4 ++--
 bridgedb/test/test_bridgedb.py            |  4 ++--
 bridgedb/test/test_crypto.py              |  4 ++--
 bridgedb/test/test_email_autoresponder.py |  6 +++---
 bridgedb/test/test_email_distributor.py   |  2 +-
 bridgedb/test/test_email_server.py        |  6 +++---
 bridgedb/test/test_https.py               |  6 +++---
 bridgedb/test/test_https_distributor.py   |  6 +++---
 bridgedb/test/test_https_server.py        | 10 +++++-----
 bridgedb/test/test_parse_descriptors.py   |  2 +-
 bridgedb/test/test_smtp.py                |  4 ++--
 bridgedb/test/test_translations.py        |  2 +-
 12 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/bridgedb/test/test_Tests.py b/bridgedb/test/test_Tests.py
index 79e0daa..41bd4ca 100644
--- a/bridgedb/test/test_Tests.py
+++ b/bridgedb/test/test_Tests.py
@@ -26,8 +26,8 @@ import os
 from twisted.python import monkey
 from twisted.trial import unittest
 
-from . import legacy_Tests as Tests
-from . import deprecated
+from bridgedb.test import legacy_Tests as Tests
+from bridgedb.test import deprecated
 
 
 logging.disable(50)
diff --git a/bridgedb/test/test_bridgedb.py b/bridgedb/test/test_bridgedb.py
index 00c231b..70c71f0 100644
--- a/bridgedb/test/test_bridgedb.py
+++ b/bridgedb/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 .util import processExists
-from .util import getBridgeDBPID
+from bridgedb.test.util import processExists
+from bridgedb.test.util import getBridgeDBPID
 
 
 class BridgeDBCliTest(unittest.TestCase):
diff --git a/bridgedb/test/test_crypto.py b/bridgedb/test/test_crypto.py
index 3010b5c..10974bb 100644
--- a/bridgedb/test/test_crypto.py
+++ b/bridgedb/test/test_crypto.py
@@ -34,8 +34,8 @@ from bridgedb import crypto
 from bridgedb import txrecaptcha
 from bridgedb.persistent import Conf
 
-from .util import fileCheckDecorator
-from .email_helpers import _createConfig
+from bridgedb.test.util import fileCheckDecorator
+from bridgedb.test.email_helpers import _createConfig
 
 
 logging.disable(50)
diff --git a/bridgedb/test/test_email_autoresponder.py b/bridgedb/test/test_email_autoresponder.py
index 77fb77a..6bdac9e 100644
--- a/bridgedb/test/test_email_autoresponder.py
+++ b/bridgedb/test/test_email_autoresponder.py
@@ -27,9 +27,9 @@ from bridgedb.email import autoresponder
 from bridgedb.email.server import SMTPMessage
 from bridgedb.email.distributor import TooSoonEmail
 
-from .email_helpers import _createConfig
-from .email_helpers import _createMailServerContext
-from .email_helpers import DummyEmailDistributorWithState
+from bridgedb.test.email_helpers import _createConfig
+from bridgedb.test.email_helpers import _createMailServerContext
+from bridgedb.test.email_helpers import DummyEmailDistributorWithState
 
 
 class CreateResponseBodyTests(unittest.TestCase):
diff --git a/bridgedb/test/test_email_distributor.py b/bridgedb/test/test_email_distributor.py
index dd9997e..0d727b8 100644
--- a/bridgedb/test/test_email_distributor.py
+++ b/bridgedb/test/test_email_distributor.py
@@ -29,7 +29,7 @@ from bridgedb.parse.addr import BadEmail
 from bridgedb.parse.addr import UnsupportedDomain
 from bridgedb.parse.addr import normalizeEmail
 
-from .util import generateFakeBridges
+from bridgedb.test.util import generateFakeBridges
 
 logging.disable(50)
 
diff --git a/bridgedb/test/test_email_server.py b/bridgedb/test/test_email_server.py
index 3a3d62d..946133c 100644
--- a/bridgedb/test/test_email_server.py
+++ b/bridgedb/test/test_email_server.py
@@ -37,9 +37,9 @@ from bridgedb.email.distributor import TooSoonEmail
 from bridgedb.parse.addr import BadEmail
 from bridgedb.schedule import Unscheduled
 
-from . import util
-from .email_helpers import _createConfig
-from .email_helpers import _createMailServerContext
+from bridgedb.test import util
+from bridgedb.test.email_helpers import _createConfig
+from bridgedb.test.email_helpers import _createMailServerContext
 
 
 class SMTPMessageTests(unittest.TestCase):
diff --git a/bridgedb/test/test_https.py b/bridgedb/test/test_https.py
index c29d6b0..8432c20 100644
--- a/bridgedb/test/test_https.py
+++ b/bridgedb/test/test_https.py
@@ -38,9 +38,9 @@ from twisted.trial.reporter import TestResult
 from twisted.trial.unittest import FailTest
 from twisted.trial.unittest import SkipTest
 
-from .test_Tests import DynamicTestCaseMeta
-from .util import processExists
-from .util import getBridgeDBPID
+from bridgedb.test.test_Tests import DynamicTestCaseMeta
+from bridgedb.test.util import processExists
+from bridgedb.test.util import getBridgeDBPID
 
 
 HTTP_ROOT = 'http://127.0.0.1:6788'
diff --git a/bridgedb/test/test_https_distributor.py b/bridgedb/test/test_https_distributor.py
index a287420..0d20960 100644
--- a/bridgedb/test/test_https_distributor.py
+++ b/bridgedb/test/test_https_distributor.py
@@ -27,9 +27,9 @@ from bridgedb.https import distributor
 from bridgedb.https.request import HTTPSBridgeRequest
 from bridgedb.proxy import ProxySet
 
-from .util import randomValidIPv4String
-from .util import generateFakeBridges
-from .https_helpers import DummyRequest
+from bridgedb.test.util import randomValidIPv4String
+from bridgedb.test.util import generateFakeBridges
+from bridgedb.test.https_helpers import DummyRequest
 
 logging.disable(50)
 
diff --git a/bridgedb/test/test_https_server.py b/bridgedb/test/test_https_server.py
index 1880c8b..3827bfe 100644
--- a/bridgedb/test/test_https_server.py
+++ b/bridgedb/test/test_https_server.py
@@ -30,11 +30,11 @@ from twisted.web.test import requesthelper
 from bridgedb.https import server
 from bridgedb.schedule import ScheduledInterval
 
-from .https_helpers import _createConfig
-from .https_helpers import DummyRequest
-from .https_helpers import DummyHTTPSDistributor
-from .util import DummyBridge
-from .util import DummyMaliciousBridge
+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
 
 
 # For additional logger output for debugging, comment out the following:
diff --git a/bridgedb/test/test_parse_descriptors.py b/bridgedb/test/test_parse_descriptors.py
index bc565e1..df7f34f 100644
--- a/bridgedb/test/test_parse_descriptors.py
+++ b/bridgedb/test/test_parse_descriptors.py
@@ -33,7 +33,7 @@ except (ImportError, NameError), error:
 else:
     HAS_STEM = True
 
-from .util import Benchmarker
+from bridgedb.test.util import Benchmarker
 
 
 BRIDGE_NETWORKSTATUS_0 = '''\
diff --git a/bridgedb/test/test_smtp.py b/bridgedb/test/test_smtp.py
index 0ac4ada..de443b3 100644
--- a/bridgedb/test/test_smtp.py
+++ b/bridgedb/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 .util import processExists
-from .util import getBridgeDBPID
+from bridgedb.test.util import processExists
+from bridgedb.test.util import getBridgeDBPID
 
 # ------------- SMTP Client Config
 SMTP_DEBUG_LEVEL = 0  # set to 1 to see SMTP message exchange
diff --git a/bridgedb/test/test_translations.py b/bridgedb/test/test_translations.py
index 54c27a0..5f99901 100644
--- a/bridgedb/test/test_translations.py
+++ b/bridgedb/test/test_translations.py
@@ -11,7 +11,7 @@
 from twisted.trial import unittest
 
 from bridgedb import translations
-from .https_helpers import DummyRequest
+from bridgedb.test.https_helpers import DummyRequest
 
 
 REALISH_HEADERS = {





More information about the tor-commits mailing list