From: Guido van Rossum <guido@python.org>
Date: Wed, 2 Jan 2008 03:52:38 +0000 (+0000)
Subject: Get rid of raw_input() emulation, use its reincarnation as input().
X-Git-Tag: v3.0a3~263
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c086c0037a35ccbb9a78db245572c05e54425e7;p=thirdparty%2FPython%2Fcpython.git

Get rid of raw_input() emulation, use its reincarnation as input().
See Issue 1707.
---

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index d94c3d30dacf..1bab8e344c64 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1532,11 +1532,6 @@ def writedocs(dir, pkgpath='', done=None):
         writedoc(modname)
     return
 
-def raw_input(prompt):
-    sys.stdout.write(prompt)
-    sys.stdout.flush()
-    return sys.stdin.readline()
-
 class Helper:
     keywords = {
         'and': 'BOOLEAN',
@@ -1706,9 +1701,9 @@ has the same effect as typing a particular string at the help> prompt.
             self.help(request)
 
     def getline(self, prompt):
-        """Read one line, using raw_input when available."""
+        """Read one line, using input() when appropriate."""
         if self.input is sys.stdin:
-            return raw_input(prompt)
+            return input(prompt)
         else:
             self.output.write(prompt)
             self.output.flush()