flake8, export proper symbols

txtorcon/__init__.py

@@ -50,10 +50,11 @@
 )
 
 __all__ = [
+    "connect", "launch",  # connect, launch return instance of Tor()...
+    "Tor",                # ...which is the preferred high-level API
     "Router",
     "Circuit",
     "Stream",
-    "connect",
     "TorControlProtocol", "TorProtocolError", "TorProtocolFactory",
     "TorState", "DEFAULT_VALUE",
     "TorInfo",

txtorcon/circuit.py

@@ -5,18 +5,15 @@
 from __future__ import unicode_literals
 from __future__ import with_statement
 
-import six
 import time
 from datetime import datetime
 
 from twisted.python.failure import Failure
 from twisted.python import log
 from twisted.internet import defer
-from twisted.internet.interfaces import IStreamClientEndpoint
-from zope.interface import implementer
 
-from .interface import IRouterContainer, IStreamAttacher
-from txtorcon.util import find_keywords, maybe_ip_addr
+from .interface import IRouterContainer
+from txtorcon.util import find_keywords
 
 
 # look like "2014-01-25T02:12:14.593772"

txtorcon/controller.py

@@ -885,7 +885,7 @@ def outReceived(self, data):
 # this Deferred into the notifications -- BUT we might try again, so
 # we need to know "have we given up -- had an error" and only in that
 # case send to the connected things. I think?
-##            d.addCallback(self._maybe_notify_connected)
+#            d.addCallback(self._maybe_notify_connected)
 
     def _timeout_expired(self):
         """