diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2019-05-31 16:54:34 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2019-05-31 16:54:34 -0400 |
| commit | 1b305d2c90778788bc6b9f5281fe89379c01a919 (patch) | |
| tree | 01cd52bdd84efb2324be41d47a339b3710d326ca | |
| parent | c51d7c8c3c3494bc1fa8be990ffa816b2d59fd3a (diff) | |
| parent | b099492a05488be8c5ec696be02ca9bd20f7ddf7 (diff) | |
Merge branch '2.3' into 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 ba755aee..8a1eb76b 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>` |