diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst index f6f41b33b7a..caea301be26 100644 --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -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 example:: - >>> def raw_input(prompt): - ... import sys - ... sys.stdout.write(prompt) - ... sys.stdout.flush() - ... return sys.stdin.readline() - ... - >>> x = int(raw_input("Please enter an integer: ")) + >>> x = int(input("Please enter an integer: ")) >>> if x < 0: ... x = 0 ... print 'Negative changed to zero' @@ -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 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!'): while True: - ok = raw_input(prompt) + ok = input(prompt) if ok in ('y', 'ye', 'yes'): return True if ok in ('n', 'no', 'nop', 'nope'): return False retries = retries - 1 diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst index 99af9c7635d..2f2719ad368 100644 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -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 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: ... try: - ... x = int(raw_input("Please enter a number: ")) + ... x = int(input("Please enter a number: ")) ... break ... except ValueError: ... print "Oops! That was no valid number. Try again..."