summaryrefslogtreecommitdiffhomepage
path: root/tests/test_auth.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_auth.py
parent120071283d5490f1f942be764c1284b93cddcf0c (diff)
parent386384a498dab4bd128433f77f0839cee86d288b (diff)
Merge remote-tracking branch 'scottkmaxwell/python3-with-import-fix' into python3
Diffstat (limited to 'tests/test_auth.py')
-rw-r--r--tests/test_auth.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/test_auth.py b/tests/test_auth.py
index d26b1807..1d972d53 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -25,10 +25,9 @@ import threading
import unittest
from paramiko import Transport, ServerInterface, RSAKey, DSSKey, \
- SSHException, BadAuthenticationType, InteractiveQuery, ChannelException, \
+ BadAuthenticationType, InteractiveQuery, \
AuthenticationException
from paramiko import AUTH_FAILED, AUTH_PARTIALLY_SUCCESSFUL, AUTH_SUCCESSFUL
-from paramiko import OPEN_SUCCEEDED, OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED
from paramiko.py3compat import u
from tests.loop import LoopSocket
from tests.util import test_path