Merge remote-tracking branch 'scottkmaxwell/py3-support-without-py25' into python3

Conflicts:
	dev-requirements.txt
	paramiko/__init__.py
	paramiko/file.py
	paramiko/hostkeys.py
	paramiko/message.py
	paramiko/proxy.py
	paramiko/server.py
	paramiko/transport.py
	paramiko/util.py
	paramiko/win_pageant.py
	setup.py

1 files changed, 2 insertions, 2 deletions

diff --git a/paramiko/proxy.py b/paramiko/proxy.py
index 10f0728f..c7e93efa 100644
--- a/paramiko/proxy.py
+++ b/paramiko/proxy.py
@@ -59,7 +59,7 @@ class ProxyCommand(object):
         """
         try:
             self.process.stdin.write(content)
-        except IOError, e:
+        except IOError as e:
             # There was a problem with the child process. It probably
             # died and we can't proceed. The best option here is to
             # raise an exception informing the user that the informed
@@ -95,7 +95,7 @@ class ProxyCommand(object):
             return result
         except socket.timeout:
             raise # socket.timeout is a subclass of IOError
-        except IOError, e:
+        except IOError as e:
             raise ProxyCommandFailure(' '.join(self.cmd), e.strerror)
 
     def close(self):