commit e792fc2c56eae9467dbc30f0489c3f78dd02146b Author: Isis Lovecruft <isis@torproject.org> Date: Mon May 11 21:23:46 2015 +0000 Remove unused imports from bridgedb.Main module. Conflicts: lib/bridgedb/Main.py --- lib/bridgedb/Main.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index d6b31a9..1714a53 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -27,19 +27,15 @@ from bridgedb import proxy from bridgedb import safelog from bridgedb import schedule from bridgedb import util -from bridgedb.bridges import InvalidPluggableTransportIP from bridgedb.bridges import MalformedBridgeInfo -from bridgedb.bridges import MalformedPluggableTransport from bridgedb.bridges import MissingServerDescriptorDigest from bridgedb.bridges import ServerDescriptorDigestMismatch from bridgedb.bridges import ServerDescriptorWithoutNetworkstatus from bridgedb.bridges import PluggableTransport from bridgedb.bridges import Bridge from bridgedb.configure import loadConfig -from bridgedb.configure import Conf from bridgedb.parse import descriptors from bridgedb.parse import options -from bridgedb.parse.addr import isIPAddress import bridgedb.Storage