Updated travis config to correctly run py3 tests. Updated requirements to avoid broken paramiko version on py3. Updated ssh client and embedded server to be py3 compatible.

Author: Dan

.travis.yml

@@ -9,7 +9,10 @@ python:
 install:
   - pip install -r requirements.txt
   - pip install coveralls
-script: python setup.py nosetests --with-coverage --cover-package=pssh
+script:
+  - python setup.py nosetests --with-coverage --cover-package=pssh
+  # If using py3, run 2to3 on embedded server and tests and run nosetests for new test dir
+  - python -c 'import sys; sys.version_info.major==3 and sys.exit(1)' || 2to3 -nw embedded_server/*.py && 2to3 tests/*.py -o tests3 -nw && cp tests/test_client_private_key tests3/ && python setup.py nosetests -w tests3 --with-coverage --cover-package=pssh
 notifications:
   email:
     on_failure: change

embedded_server/embedded_server.py

@@ -25,6 +25,9 @@
 paramiko repository
 """
 
+import sys
+if 'threading' in sys.modules:
+    del sys.modules['threading']
 import gevent
 import os
 import socket
@@ -106,7 +109,7 @@ def check_channel_exec_request(self, channel, cmd):
 
     def _read_response(self, channel, process):
         for line in process.stdout:
-            channel.send(line)
+            channel.send(line.decode('ascii'))
         process.communicate()
         channel.send_exit_status(process.returncode)
         logger.debug("Command finished with return code %s", process.returncode)

pssh/ssh_client.py

@@ -237,7 +237,7 @@ def exec_command(self, command, sudo=False, user=None, **kwargs):
     def _read_output_buffer(self, output_buffer, prefix=''):
         """Read from output buffers and log to host_logger"""
         for line in output_buffer:
-            output = line.strip()
+            output = line.strip().decode('ascii')
             host_logger.info("[%s]%s\t%s", self.host, prefix, output,)
             yield output
 

requirements.txt

@@ -1,2 +1,2 @@
-paramiko>=1.9
+paramiko>=1.9,<1.16.0
 gevent>=1.1rc3