summaryrefslogtreecommitdiffhomepage
path: root/tests/test_pkey.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_pkey.py
parent120071283d5490f1f942be764c1284b93cddcf0c (diff)
parent386384a498dab4bd128433f77f0839cee86d288b (diff)
Merge remote-tracking branch 'scottkmaxwell/python3-with-import-fix' into python3
Diffstat (limited to 'tests/test_pkey.py')
-rw-r--r--tests/test_pkey.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_pkey.py b/tests/test_pkey.py
index 2e565a5f..6ff68fc2 100644
--- a/tests/test_pkey.py
+++ b/tests/test_pkey.py
@@ -23,7 +23,8 @@ Some unit tests for public/private key objects.
from binascii import hexlify
import unittest
from paramiko import RSAKey, DSSKey, ECDSAKey, Message, util
-from paramiko.common import rng, StringIO, byte_chr, b, bytes
+from paramiko.py3compat import StringIO, byte_chr, b, bytes
+from paramiko.common import rng
from tests.util import test_path
# from openssh's ssh-keygen