Updated exception handling syntax. Added wheel configuration

Author: Dan

embedded_server/embedded_server.py

@@ -104,7 +104,7 @@ def check_channel_direct_tcpip_request(self, chanid, origin, destination):
         try:
             tunnel = Tunneler(destination, self.transport, chanid)
             tunnel.start()
-        except Exception, ex:
+        except Exception as ex:
             logger.error("Error creating proxy connection to %s - %s",
                          destination, ex,)
             return paramiko.OPEN_FAILED_CONNECT_FAILED
@@ -144,7 +144,7 @@ def make_socket(listen_ip, port=0):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind((listen_ip, port))
-    except Exception, e:
+    except Exception as e:
         logger.error('Failed to bind to address - %s' % (str(e),))
         traceback.print_exc()
         return
@@ -166,7 +166,7 @@ def listen(sock, fail_auth=False, ssh_exception=False,
         sock.listen(100)
         logger.info('Listening for connection on %s:%s..', listen_ip,
                     listen_port)
-    except Exception, e:
+    except Exception as e:
         logger.error('*** Listen failed: %s' % (str(e),))
         traceback.print_exc()
         return
@@ -185,7 +185,7 @@ def _handle_ssh_connection(transport, fail_auth=False,
                     fail_auth=fail_auth, ssh_exception=ssh_exception)
     try:
         transport.start_server(server=server)
-    except paramiko.SSHException, e:
+    except paramiko.SSHException as e:
         logger.exception('SSH negotiation failed')
         return
     except Exception:
@@ -216,7 +216,7 @@ def handle_ssh_connection(sock,
         transport = paramiko.Transport(conn)
         _handle_ssh_connection(transport, fail_auth=fail_auth,
                                ssh_exception=ssh_exception)
-    except Exception, e:
+    except Exception as e:
         logger.error('*** Caught exception: %s: %s' % (str(e.__class__), str(e),))
         traceback.print_exc()
         try:

embedded_server/tunnel.py

@@ -66,6 +66,6 @@ def run(self):
                      self.transport.get_username())
         try:
             self.tunnel(self.socket, channel)
-        except Exception, ex:
+        except Exception as ex:
             logger.exception("Got exception creating tunnel - %s", ex,)
         logger.debug("Finished tunneling")

pssh/pssh_client.py

@@ -616,11 +616,11 @@ def get_output(self, cmd, output):
         """
         try:
             (channel, host, stdout, stderr, stdin) = cmd.get()
-        except Exception, ex:
+        except Exception as ex:
             exc = sys.exc_info()
             try:
                 host = ex.args[1]
-            except IndexError, _ex:
+            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]

pssh/ssh_client.py

@@ -147,7 +147,7 @@ def _connect_tunnel(self):
             'direct-tcpip', (self.host, self.port,), ('127.0.0.1', 0))
           sleep(0)
           return self._connect(self.client, self.host, self.port, sock=proxy_channel)
-        except ChannelException, ex:
+        except ChannelException as ex:
           error_type = ex.args[1] if len(ex.args) > 1 else ex.args[0]
           raise ConnectionErrorException("Error connecting to host '%s:%s' - %s",
                                          self.host, self.port,
@@ -168,7 +168,7 @@ def _connect(self, client, host, port, sock=None, retries=1,
                            port=port, pkey=pkey if pkey else self.pkey,
                            sock=sock, timeout=self.timeout,
                            allow_agent=self.allow_agent)
-        except sock_gaierror, ex:
+        except sock_gaierror as ex:
             logger.error("Could not resolve host '%s' - retry %s/%s",
                          host, retries, self.num_retries)
             while retries < self.num_retries:
@@ -178,7 +178,7 @@ def _connect(self, client, host, port, sock=None, retries=1,
             raise UnknownHostException("Unknown host %s - %s - retry %s/%s",
                                        host, str(ex.args[1]), retries,
                                        self.num_retries)
-        except sock_error, ex:
+        except sock_error as ex:
             logger.error("Error connecting to host '%s:%s' - retry %s/%s",
                          self.host, self.port, retries, self.num_retries)
             while retries < self.num_retries:
@@ -189,12 +189,12 @@ def _connect(self, client, host, port, sock=None, retries=1,
             raise ConnectionErrorException("Error connecting to host '%s:%s' - %s - retry %s/%s",
                                            self.host, self.port,
                                            str(error_type), retries, self.num_retries,)
-        except paramiko.AuthenticationException, ex:
+        except paramiko.AuthenticationException as ex:
             msg = "Authentication error while connecting to %s:%s."
             raise AuthenticationException(msg, host, port)
         # SSHException is more general so should be below other types
         # of SSH failure
-        except paramiko.SSHException, ex:
+        except paramiko.SSHException as ex:
             msg = "General SSH error - %s" % (ex,)
             logger.error(msg)
             raise SSHException(msg, host, port)
@@ -289,7 +289,7 @@ def _mkdir(self, sftp, directory):
         """
         try:
             sftp.mkdir(directory)
-        except IOError, error:
+        except IOError as error:
             msg = "Error occured creating directory %s on %s - %s"
             logger.error(msg, directory, self.host, error)
             raise IOError(msg, directory, self.host, error)
@@ -372,7 +372,7 @@ def copy_file(self, local_file, remote_file, recurse=False):
         sftp.chdir()
         try:
             sftp.put(local_file, remote_file)
-        except Exception, error:
+        except Exception as error:
             logger.error("Error occured copying file %s to remote destination %s:%s - %s",
                          local_file, self.host, remote_file, error)
             raise error

setup.cfg

@@ -3,3 +3,6 @@ VCS = git
 style = pep440
 versionfile_source = pssh/_version.py
 tag_prefix = ''
+
+[bdist_wheel]
+universal = 0