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

[brett.cannon]

http://hg.python.org/cpython/rev/fbd1b092f937
changeset:   83926:fbd1b092f937
parent:      83924:eaa8f957351c
parent:      83925:b29c513c4fa5
user:        Brett Cannon <brett at python.org>
date:        Sat May 25 11:29:03 2013 -0400
summary:
  merge

files:
  Doc/library/unittest.mock.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -467,7 +467,7 @@
         mock and unless the function returns the :data:`DEFAULT` singleton the
         call to the mock will then return whatever the function returns. If the
         function returns :data:`DEFAULT` then the mock will return its normal
-        value (from the :attr:`return_value`.
+        value (from the :attr:`return_value`).
 
         An example of a mock that raises an exception (to test exception
         handling of an API):

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