[Python-3000-checkins] r59660 - python/branches/py3k/Lib/pydoc.py

[guido.van.rossum]

Author: guido.van.rossum
Date: Wed Jan  2 04:52:38 2008
New Revision: 59660

Modified:
   python/branches/py3k/Lib/pydoc.py
Log:
Get rid of raw_input() emulation, use its reincarnation as input().
See Issue 1707.


Modified: python/branches/py3k/Lib/pydoc.py
==============================================================================
--- python/branches/py3k/Lib/pydoc.py	(original)
+++ python/branches/py3k/Lib/pydoc.py	Wed Jan  2 04:52:38 2008
@@ -1532,11 +1532,6 @@
         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 @@
             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()