diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-09-30 14:32:07 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-09-30 14:32:07 -0700 |
| commit | e520165eeec1b7c2d165ab611f7947b6c8d4da0f (patch) | |
| tree | c8850718276b91933a47919b8ee82e08bcd7564d | |
| parent | 977c237d711b27b10ee29f960c270c80956cc291 (diff) | |
| parent | 0e9b78539da392170dd09d629bcfaef9cf724bc1 (diff) | |
| download | paramiko-e520165eeec1b7c2d165ab611f7947b6c8d4da0f.tar.gz | |
Merge branch '1.15'
| -rw-r--r-- | paramiko/hostkeys.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py index 7e2d22cf..c7e1f72e 100644 --- a/paramiko/hostkeys.py +++ b/paramiko/hostkeys.py @@ -19,7 +19,6 @@ import binascii import os -import ssh_exception from hashlib import sha1 from hmac import HMAC @@ -36,6 +35,7 @@ from paramiko.dsskey import DSSKey from paramiko.rsakey import RSAKey from paramiko.util import get_logger, constant_time_bytes_eq from paramiko.ecdsakey import ECDSAKey +from paramiko.ssh_exception import SSHException class HostKeys (MutableMapping): @@ -99,7 +99,7 @@ class HostKeys (MutableMapping): continue try: e = HostKeyEntry.from_line(line, lineno) - except ssh_exception.SSHException: + except SSHException: continue if e is not None: _hostnames = e.hostnames |