diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-24 20:45:36 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-24 20:45:36 -0700 |
| commit | 08b76eaa39983ea931bc285c1df3a105f78c185f (patch) | |
| tree | 7263f9141de3c731141f4b9a8e64eaaf831ec274 | |
| parent | 986ccb0b30591e8db695c6a6225ddc09e867dc3b (diff) | |
| parent | 905e4a115f90a356df92394067d1b6c555c18fad (diff) | |
Merge branch '1.16' into 1.17
| -rw-r--r-- | paramiko/transport.py | 4 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index 18fb103b..5e175230 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -55,7 +55,7 @@ from paramiko.kex_gss import KexGSSGex, KexGSSGroup1, KexGSSGroup14, NullHostKey from paramiko.message import Message from paramiko.packet import Packetizer, NeedRekeyException from paramiko.primes import ModulusPack -from paramiko.py3compat import string_types, long, byte_ord, b +from paramiko.py3compat import string_types, long, byte_ord, b, input from paramiko.rsakey import RSAKey from paramiko.ecdsakey import ECDSAKey from paramiko.server import ServerInterface @@ -1395,7 +1395,7 @@ class Transport (threading.Thread, ClosingContextManager): print(instructions.strip()) for prompt,show_input in prompt_list: print(prompt.strip(),end=' ') - answers.append(raw_input()) + answers.append(input()) return answers return self.auth_interactive(username, handler, submethods) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index f8d781fc..8caaba22 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -3,6 +3,8 @@ Changelog ========= * :release:`1.17.0 <2016-04-25>` +* :bug:`716` Fix a Python 3 compatibility issue when handling two-factor + authentication. Thanks to Mateusz Kowalski for the catch & original patch. * :support:`729 backported` Clean up ``setup.py`` to always use ``setuptools``, not doing so was a historical artifact from bygone days. Thanks to Alex Gaynor. |