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

[terry.reedy]

http://hg.python.org/cpython/rev/0376c5103a03
changeset:   88599:0376c5103a03
parent:      88597:0bcf1669912a
parent:      88598:36c9a233ebf0
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Tue Jan 21 00:02:17 2014 -0500
summary:
  Merge with 3.3

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


diff --git a/Doc/library/unittest.mock-examples.rst b/Doc/library/unittest.mock-examples.rst
--- a/Doc/library/unittest.mock-examples.rst
+++ b/Doc/library/unittest.mock-examples.rst
@@ -476,7 +476,7 @@
 we are only interested in the return value from the final call to
 `start_call` so we don't have much configuration to do. Let's assume the
 object it returns is 'file-like', so we'll ensure that our response object
-uses the builtin `file` as its `spec`.
+uses the builtin `open` as its `spec`.
 
 To do this we create a mock instance as our mock backend and create a mock
 response object for it. To set the response as the return value for that final
@@ -488,7 +488,7 @@
 method to directly set the return value for us:
 
     >>> something = Something()
-    >>> mock_response = Mock(spec=file)
+    >>> mock_response = Mock(spec=open)
     >>> mock_backend = Mock()
     >>> config = {'get_endpoint.return_value.create_call.return_value.start_call.return_value': mock_response}
     >>> mock_backend.configure_mock(**config)

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