diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2019-05-31 16:54:03 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2019-05-31 16:54:03 -0400 |
| commit | 42ed0f01280cd0619dc4dc44376d99496ee281aa (patch) | |
| tree | cbe6ca8fd2cb55ce0f7b2ea3fd1433fef2cc8089 | |
| parent | 744da0043575b25bd1db759e700bb2442e7261f1 (diff) | |
| parent | e43b1dca9bf365261ad5c979c3523a0aaf23a96d (diff) | |
Merge branch '2.1' into 2.2
| -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 1cdddb62..3aac1341 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 b01e596d..b7806adc 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.2.4 <2018-09-18>` - :release:`2.1.6 <2018-09-18>` - :release:`2.0.9 <2018-09-18>` |