summaryrefslogtreecommitdiffhomepage
path: root/tests/test_util.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-13 11:19:04 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-03-13 11:19:04 -0700
commitba55eea38df24b2b5f161874947637b48613f6ca (patch)
tree9197d29d310c266a089b1a27459b998e86dac392 /tests/test_util.py
parent120071283d5490f1f942be764c1284b93cddcf0c (diff)
parent386384a498dab4bd128433f77f0839cee86d288b (diff)
Merge remote-tracking branch 'scottkmaxwell/python3-with-import-fix' into python3
Diffstat (limited to 'tests/test_util.py')
-rw-r--r--tests/test_util.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/test_util.py b/tests/test_util.py
index 4f85c391..6bde4045 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -23,11 +23,10 @@ Some unit tests for utility functions.
from binascii import hexlify
import errno
import os
-import unittest
from Crypto.Hash import SHA
import paramiko.util
from paramiko.util import lookup_ssh_host_config as host_config
-from paramiko.py3compat import StringIO, byte_ord, b
+from paramiko.py3compat import StringIO, byte_ord
from tests.util import ParamikoTest
@@ -338,4 +337,4 @@ AddressFamily inet
IdentityFile something_%l_using_fqdn
"""
config = paramiko.util.parse_ssh_config(StringIO(test_config))
- assert config.lookup('meh') # will die during lookup() if bug regresses
+ assert config.lookup('meh') # will die during lookup() if bug regresses