[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3

[andrew.kuchling]

http://hg.python.org/cpython/rev/79ed8e3e3dc6
changeset:   88925:79ed8e3e3dc6
parent:      88923:f5178269ccb1
parent:      88924:3afb9d94d18f
user:        Andrew Kuchling <amk at amk.ca>
date:        Mon Feb 03 09:20:22 2014 -0500
summary:
  Merge from 3.3

files:
  Doc/tutorial/controlflow.rst |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -370,7 +370,7 @@
                return False
            retries = retries - 1
            if retries < 0:
-               raise IOError('refusenik user')
+               raise IOError('uncooperative user')
            print(complaint)
 
 This function can be called in several ways:
@@ -756,4 +756,3 @@
 .. [#] Actually, *call by object reference* would be a better description,
    since if a mutable object is passed, the caller will see any changes the
    callee makes to it (items inserted into a list).
-

-- 
Repository URL: http://hg.python.org/cpython