summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-24 20:43:00 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-24 20:43:00 -0700
commit39379ff87fb561745dd2e2182dbc207302356b21 (patch)
tree55ef418334b8dacc07638e9987933e44c54a2f22
parent156ab24168bbc0ecf8adb1b2b290db430aea15fc (diff)
downloadparamiko-39379ff87fb561745dd2e2182dbc207302356b21.tar.gz
Actually! we can just use the py3compat module
Re #716
-rw-r--r--paramiko/transport.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 9f83f08a..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,10 +1395,7 @@ class Transport (threading.Thread, ClosingContextManager):
print(instructions.strip())
for prompt,show_input in prompt_list:
print(prompt.strip(),end=' ')
- if (sys.version_info > (3, 0)):
- answers.append(input())
- else:
- answers.append(raw_input())
+ answers.append(input())
return answers
return self.auth_interactive(username, handler, submethods)