diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2019-05-31 16:54:38 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2019-05-31 16:54:38 -0400 |
| commit | 472ea6b26deb10e2555d91c90c82e8c43557b995 (patch) | |
| tree | 60c69a1fda126830dda4f4436d8a0d8a373a03ec | |
| parent | 4fb28a1d66a421a6f2f4f68d767e474e0a5c73d6 (diff) | |
| parent | 1b305d2c90778788bc6b9f5281fe89379c01a919 (diff) | |
| download | paramiko-472ea6b26deb10e2555d91c90c82e8c43557b995.tar.gz | |
Merge branch '2.4'
| -rw-r--r-- | paramiko/hostkeys.py | 6 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py index f31b8819..d0660cc8 100644 --- a/paramiko/hostkeys.py +++ b/paramiko/hostkeys.py @@ -19,8 +19,12 @@ import binascii import os +import sys -from collections import MutableMapping +if sys.version_info[:2] >= (3, 3): + from collections.abc import MutableMapping +else: + from collections import MutableMapping from hashlib import sha1 from hmac import HMAC diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index ff87bfbb..25d11217 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +- :support:`1378 backported` Add support for the modern (as of Python 3.3) + import location of ``MutableMapping`` (used in host key management) to avoid + the old location becoming deprecated in Python 3.8. Thanks to Josh Karpel for + catch & patch. - :release:`2.4.2 <2018-09-18>` - :release:`2.3.3 <2018-09-18>` - :release:`2.2.4 <2018-09-18>` |