Commit e9af284e authored by Georg Brandl's avatar Georg Brandl

No need to define raw_input(), input() does the same.

parent ed44a1a6
...@@ -16,13 +16,7 @@ control flow statements known from other languages, with some twists. ...@@ -16,13 +16,7 @@ control flow statements known from other languages, with some twists.
Perhaps the most well-known statement type is the :keyword:`if` statement. For Perhaps the most well-known statement type is the :keyword:`if` statement. For
example:: example::
>>> def raw_input(prompt): >>> x = int(input("Please enter an integer: "))
... import sys
... sys.stdout.write(prompt)
... sys.stdout.flush()
... return sys.stdin.readline()
...
>>> x = int(raw_input("Please enter an integer: "))
>>> if x < 0: >>> if x < 0:
... x = 0 ... x = 0
... print 'Negative changed to zero' ... print 'Negative changed to zero'
...@@ -298,15 +292,9 @@ The most useful form is to specify a default value for one or more arguments. ...@@ -298,15 +292,9 @@ The most useful form is to specify a default value for one or more arguments.
This creates a function that can be called with fewer arguments than it is This creates a function that can be called with fewer arguments than it is
defined to allow. For example:: defined to allow. For example::
def raw_input(prompt):
import sys
sys.stdout.write(prompt)
sys.stdout.flush()
return sys.stdin.readline()
def ask_ok(prompt, retries=4, complaint='Yes or no, please!'): def ask_ok(prompt, retries=4, complaint='Yes or no, please!'):
while True: while True:
ok = raw_input(prompt) ok = input(prompt)
if ok in ('y', 'ye', 'yes'): return True if ok in ('y', 'ye', 'yes'): return True
if ok in ('n', 'no', 'nop', 'nope'): return False if ok in ('n', 'no', 'nop', 'nope'): return False
retries = retries - 1 retries = retries - 1
......
...@@ -85,15 +85,9 @@ entered, but allows the user to interrupt the program (using :kbd:`Control-C` or ...@@ -85,15 +85,9 @@ entered, but allows the user to interrupt the program (using :kbd:`Control-C` or
whatever the operating system supports); note that a user-generated interruption whatever the operating system supports); note that a user-generated interruption
is signalled by raising the :exc:`KeyboardInterrupt` exception. :: is signalled by raising the :exc:`KeyboardInterrupt` exception. ::
>>> def raw_input(prompt):
... import sys
... sys.stdout.write(prompt)
... sys.stdout.flush()
... return sys.stdin.readline()
...
>>> while True: >>> while True:
... try: ... try:
... x = int(raw_input("Please enter a number: ")) ... x = int(input("Please enter a number: "))
... break ... break
... except ValueError: ... except ValueError:
... print "Oops! That was no valid number. Try again..." ... print "Oops! That was no valid number. Try again..."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment