summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--paramiko/_version.py2
-rw-r--r--paramiko/transport.py4
-rw-r--r--sites/www/changelog.rst3
3 files changed, 6 insertions, 3 deletions
diff --git a/paramiko/_version.py b/paramiko/_version.py
index e82b8667..4b78efad 100644
--- a/paramiko/_version.py
+++ b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (1, 16, 0)
+__version_info__ = (1, 17, 0)
__version__ = '.'.join(map(str, __version_info__))
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 6d0c627a..a521ef07 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -58,7 +58,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
@@ -1397,7 +1397,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 037a1b5e..44795172 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -24,6 +24,9 @@ Changelog
simply ``pip install -U paramiko`` (especially if you **upgrade to pip
8**).
+* :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.