summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierce Lopez <pierce.lopez@gmail.com>2017-02-23 01:08:29 -0500
committerPierce Lopez <pierce.lopez@gmail.com>2017-06-01 18:20:42 -0400
commit1f8a6015091a2af6cdac6e5bf4331d1963623b1c (patch)
tree31153bde9580997aaf867f021c1660f6f3c0f132
parentae787ca94fcdf62931a3eaddbcbfdb386fe4e735 (diff)
downloadparamiko-1f8a6015091a2af6cdac6e5bf4331d1963623b1c.tar.gz
can depend on collections.MutableMapping being available
since python 2.6
-rw-r--r--paramiko/hostkeys.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py
index 18a0d333..f6850aaa 100644
--- a/paramiko/hostkeys.py
+++ b/paramiko/hostkeys.py
@@ -20,17 +20,12 @@
import binascii
import os
+from collections import MutableMapping
from hashlib import sha1
from hmac import HMAC
from paramiko.py3compat import b, u, encodebytes, decodebytes
-try:
- from collections import MutableMapping
-except ImportError:
- # noinspection PyUnresolvedReferences
- from UserDict import DictMixin as MutableMapping
-
from paramiko.dsskey import DSSKey
from paramiko.rsakey import RSAKey
from paramiko.util import get_logger, constant_time_bytes_eq