Add PySocks to requirements, tweak setup/tor slightly. Fixes #1806

mailpile/plugins/setup_magic.py

@@ -1224,11 +1224,13 @@ def autoconfig(cls, session):
 
     def auto_configure_tor(self, session):
         if session.config.tor_worker is not None:
-            hostport = ('127.0.0.1', session.config.tor_worker.socks_port)
-            success, message = self._configure_tor(session, hostport,
-                                                   port_zero=True)
-            if success:
-                return message
+            if session.config.tor_worker.isReady(wait=True):
+                time.sleep(0.1)
+                hostport = ('127.0.0.1', session.config.tor_worker.socks_port)
+                success, message = self._configure_tor(session, hostport,
+                                                       port_zero=True)
+                if success:
+                    return message
 
         if session.config.sys.tor.systemwide:
             hostport = ('127.0.0.1', 9050)
@@ -1237,13 +1239,13 @@ def auto_configure_tor(self, session):
                 return message
 
         if session.config.tor_worker is None:
-            session.config.start_tor_worker().isReady(wait=True)
-            hostport = ('127.0.0.1', session.config.tor_worker.socks_port)
-            time.sleep(0.2)
-            success, message = self._configure_tor(session, hostport,
-                                                   port_zero=True)
-            if success:
-                session.config.sys.tor.systemwide = False
+            if session.config.start_tor_worker().isReady(wait=True):
+                time.sleep(0.1)
+                hostport = ('127.0.0.1', session.config.tor_worker.socks_port)
+                success, message = self._configure_tor(session, hostport,
+                                                       port_zero=True)
+                if success:
+                    session.config.sys.tor.systemwide = False
 
         return message
 

requirements-dev.txt

@@ -11,6 +11,7 @@ nose
 mock>=1.0.1
 pycrypto
 pyDNS
+PySocks
 pgpdump
 pillow
 pbr

requirements-with-deps.txt

@@ -6,6 +6,7 @@ Jinja2
 spambayes>=1.1b1
 markupsafe
 pyDNS
+PySocks
 pgpdump
 pillow
 pbr

requirements.txt

@@ -7,6 +7,7 @@ Jinja2
 spambayes>=1.1b1
 markupsafe
 pyDNS
+PySocks
 pgpdump
 pillow
 pbr