Py3 compatibility changes for code, tests and embedded server. Updated travis config and setup.py to not use 2to3 anymore

Author: Dan

.gitignore

@@ -1,3 +1,4 @@
+*~
 *.py[cod]
 
 # C extensions

.travis.yml

@@ -14,8 +14,6 @@ install:
   - pip install coveralls
 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 >= (3,) and sys.exit(1)' || eval "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"
 after_success:
   - coveralls
 deploy:

pssh/pssh_client.py

@@ -39,6 +39,11 @@
 
 logger = logging.getLogger('pssh')
 
+try:
+    xrange
+except NameError:
+    xrange = range
+
 
 class ParallelSSHClient(object):
     """Uses :py:class:`pssh.ssh_client.SSHClient`, performs tasks over SSH on multiple hosts in \
@@ -731,7 +736,7 @@ def get_output(self, cmd, output, encoding='utf-8'):
             except IndexError as _ex:
                 logger.error("Got exception with no host argument - "
                              "cannot update output data with %s", _ex)
-                raise exc[1], None, exc[2]
+                raise exc[1]
             self._update_host_output(output, host, None, None, None, None, None, cmd,
                                      exception=ex)
             raise

setup.cfg

@@ -5,4 +5,4 @@ versionfile_source = pssh/_version.py
 tag_prefix = ''
 
 [bdist_wheel]
-universal = 0
+universal = 1

setup.py

@@ -14,14 +14,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 from setuptools import setup, find_packages
-import sys
 
 import versioneer
 
-convert_2_to_3 = {}
-if sys.version_info >= (3,):
-    convert_2_to_3['use_2to3'] = True
-
 setup(name='parallel-ssh',
       version=versioneer.get_version(),
       cmdclass=versioneer.get_cmdclass(),
@@ -47,5 +42,4 @@
         'Operating System :: POSIX :: BSD',
         'Operating System :: Microsoft :: Windows',
         ],
-        **convert_2_to_3
       )

tests/test_pssh_client.py

@@ -48,6 +48,13 @@
 pssh_logger.setLevel(logging.DEBUG)
 logging.basicConfig()
 
+
+try:
+    xrange
+except NameError:
+    xrange = range
+
+
 class ParallelSSHClientTest(unittest.TestCase):
 
     def setUp(self):
@@ -280,7 +287,7 @@ def test_pssh_client_retries(self):
         self.assertRaises(ConnectionErrorException, client.run_command, 'blah')
         try:
             client.run_command('blah')
-        except ConnectionErrorException, ex:
+        except ConnectionErrorException as ex:
             num_tries = ex.args[-1:][0]
             self.assertEqual(expected_num_tries, num_tries,
                              msg="Got unexpected number of retries %s - "
@@ -377,7 +384,7 @@ def test_pssh_client_copy_file_failure(self):
         test_file.write('testing\n')
         test_file.close()
         # Permission errors on writing into dir
-        mask = 0111 if sys.version_info <= (2,) else 0o111
+        mask = int('0111') if sys.version_info <= (2,) else 0o111
         os.chmod(remote_test_path, mask)
         client = ParallelSSHClient([self.host], port=self.listen_port,
                                    pkey=self.user_key)
@@ -692,7 +699,7 @@ def test_connection_error_exception(self):
                             host,))
         try:
             raise output[host]['exception']
-        except ConnectionErrorException, ex:
+        except ConnectionErrorException as ex:
             self.assertEqual(ex.args[1], host,
                              msg="Exception host argument is %s, should be %s" % (
                                  ex.args[1], host,))
@@ -717,7 +724,7 @@ def test_authentication_exception(self):
                             self.host,))
         try:
             raise output[self.host]['exception']
-        except AuthenticationException, ex:
+        except AuthenticationException as ex:
             self.assertEqual(ex.args[1], self.host,
                              msg="Exception host argument is %s, should be %s" % (
                                  ex.args[1], self.host,))
@@ -744,7 +751,7 @@ def test_ssh_exception(self):
                             host,))
         try:
             raise output[host]['exception']
-        except SSHException, ex:
+        except SSHException as ex:
             self.assertEqual(ex.args[1], host,
                              msg="Exception host argument is %s, should be %s" % (
                                  ex.args[1], host,))
@@ -824,7 +831,7 @@ def test_host_config(self):
             self.assertTrue(host in output)
         try:
             raise output[hosts[1]]['exception']
-        except AuthenticationException, ex:
+        except AuthenticationException as ex:
             pass
         else:
             raise AssertionError("Expected AutnenticationException on host %s",
@@ -952,11 +959,15 @@ def test_ssh_client_utf_encoding(self):
         client = ParallelSSHClient([self.host], port=server_port,
                                    pkey=self.user_key)
         # File is already set to utf-8, cannot use utf-16 only representations
-        # Using ascii characters encoded as utf-16 instead
+        # Using ascii characters decoded as utf-16 on py2
+        # and utf-8 encoded ascii decoded to utf-16 on py3
         output = client.run_command(self.fake_cmd, encoding='utf-16')
         stdout = list(output[self.host]['stdout'])
-        # import ipdb; ipdb.set_trace()
-        self.assertEqual([self.fake_resp.decode('utf-16')], stdout)
+        if type(self.fake_resp) == bytes:
+            self.assertEqual([self.fake_resp.decode('utf-16')], stdout)
+        else:
+            self.assertEqual([self.fake_resp.encode('utf-8').decode('utf-16')],
+                             stdout)
 
     def test_pty(self):
         cmd = "exit 0"