Merge pull request #385 from moreati/python-3.x-cleanups

Test with Tox on Python 3.x

mitogen/core.py

@@ -374,7 +374,7 @@ def io_op(func, *args):
 
     :returns:
         Tuple of `(return_value, disconnected)`, where `return_value` is the
-        return value of `func(\*args)`, and `disconnected` is :data:`True` if
+        return value of `func(*args)`, and `disconnected` is :data:`True` if
         disconnection was detected, otherwise :data:`False`.
     """
     while True:

mitogen/parent.py

@@ -1280,7 +1280,7 @@ class CallChain(object):
 
     def call_async(self, fn, *args, **kwargs):
         """
-        Arrange for `fn(\*args, \**kwargs)` to be invoked on the context's main
+        Arrange for `fn(*args, **kwargs)` to be invoked on the context's main
         thread.
 
         :param fn:

mitogen/ssh.py

@@ -291,8 +291,8 @@ class Stream(mitogen.parent.Stream):
                 raise HostKeyError(self.hostkey_failed_msg)
             elif buf.lower().startswith((
                     PERMDENIED_PROMPT,
-                    b("%s@%s: %s" % (self.username, self.hostname,
+                    b("%s@%s: " % (self.username, self.hostname))
-                                     PERMDENIED_PROMPT)),
+                        + PERMDENIED_PROMPT,
                 )):
                 # issue #271: work around conflict with user shell reporting
                 # 'permission denied' e.g. during chdir($HOME) by only matching

tox.ini

@@ -2,6 +2,8 @@
 envlist =
     py26,
     py27,
+    py35,
+    py36,
 
 [testenv]
 deps =