From: Guido van Rossum <guido@python.org>
Date: Mon, 19 Mar 2007 22:23:59 +0000 (+0000)
Subject: Use input() now that it is available.
X-Git-Tag: v3.0a1~1110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7cba8508afeac3c631ea225df2df0e4918c610ab;p=thirdparty%2FPython%2Fcpython.git

Use input() now that it is available.
---

diff --git a/Lib/urllib.py b/Lib/urllib.py
index d2ae1becf0c2..6a2b2930cd4e 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -768,11 +768,9 @@ class FancyURLopener(URLopener):
 
     def prompt_user_passwd(self, host, realm):
         """Override this in a GUI environment!"""
-        import getpass, sys
+        import getpass
         try:
-            sys.stdout.write("Enter username for %s at %s: " % (realm, host))
-            sys.stdout.flush()
-            user = sys.stdin.readline()
+            user = input("Enter username for %s at %s: " % (realm, host))
             passwd = getpass.getpass("Enter password for %s in %s at %s: " %
                 (user, realm, host))
             return user, passwd