From: Berker Peksag <berker.peksag@gmail.com>
Date: Thu, 2 Jun 2016 18:31:19 +0000 (-0700)
Subject: Issue #23116: Improve ask_ok() example in the Python tutorial
X-Git-Tag: v3.5.2rc1~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a5120e457107bc4288a60cf81b8fe0911958fc2;p=thirdparty%2FPython%2Fcpython.git

Issue #23116: Improve ask_ok() example in the Python tutorial
---

diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index 65f83bf38360..ddc08552ed70 100644
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -361,7 +361,7 @@ 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 ask_ok(prompt, retries=4, complaint='Yes or no, please!'):
+   def ask_ok(prompt, retries=4, reminder='Please try again!'):
        while True:
            ok = input(prompt)
            if ok in ('y', 'ye', 'yes'):
@@ -370,8 +370,8 @@ defined to allow.  For example::
                return False
            retries = retries - 1
            if retries < 0:
-               raise OSError('uncooperative user')
-           print(complaint)
+               raise ValueError('invalid user response')
+           print(reminder)
 
 This function can be called in several ways: