A herp and a derp (and an import shuffle)

tests/test_sftp.py

@@ -23,12 +23,13 @@
 do test file operations in (so no existing files will be harmed).
 """
 
-from binascii import hexlify
 import os
+import socket
 import sys
-import warnings
 import threading
 import unittest
+import warnings
+from binascii import hexlify
 from tempfile import mkstemp
 
 import paramiko
@@ -205,7 +206,7 @@ def test_2_sftp_can_be_used_as_context_manager(self):
         try:
             sftp.open(FOLDER + '/test2', 'w')
             self.fail('expected exception')
-        except EOFError, socket.error:
+        except (EOFError, socket.error):
             pass
         finally:
             sftp = paramiko.SFTP.from_transport(tc)