summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-09-18 16:53:48 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-09-18 16:53:48 -0700
commite27964254fbf5a55d5cc0c4db9268cc001827af1 (patch)
treec10b08200f3822de3b86d9ae47d75e899e6bb950
parent0999fda545a859b423ebe188ab4e020333dd6894 (diff)
A herp and a derp (and an import shuffle)
-rwxr-xr-xtests/test_sftp.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_sftp.py b/tests/test_sftp.py
index a35914e1..72c7ba03 100755
--- a/tests/test_sftp.py
+++ b/tests/test_sftp.py
@@ -23,12 +23,13 @@ a real actual sftp server is contacted, and a new folder is created there to
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 @@ class SFTPTest (unittest.TestCase):
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)