summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMichael Foord <michael@voidspace.org.uk>2012-04-13 19:51:20 (GMT)
committerMichael Foord <michael@voidspace.org.uk>2012-04-13 19:51:20 (GMT)
commit0682a0c0a925c52bf4d8d3030681b82796bdc6e2 (patch)
tree85a9641ea5b1383282ac196a8068bea31825c867 /Doc
parent656319e58d80478c7aa2a783606f0b50053529ae (diff)
downloadcpython-0682a0c0a925c52bf4d8d3030681b82796bdc6e2.zip
cpython-0682a0c0a925c52bf4d8d3030681b82796bdc6e2.tar.gz
cpython-0682a0c0a925c52bf4d8d3030681b82796bdc6e2.tar.bz2
Minor docstring / docs corrections for unittest.mock
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/unittest.mock-examples.rst2
-rw-r--r--Doc/library/unittest.mock.rst8
2 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/unittest.mock-examples.rst b/Doc/library/unittest.mock-examples.rst
index d220bb3..0fc32d2 100644
--- a/Doc/library/unittest.mock-examples.rst
+++ b/Doc/library/unittest.mock-examples.rst
@@ -99,7 +99,7 @@ by looking at the return value of the mocked class.
In the example below we have a function `some_function` that instantiates `Foo`
and calls a method on it. The call to `patch` replaces the class `Foo` with a
mock. The `Foo` instance is the result of calling the mock, so it is configured
-by modify the mock :attr:`~Mock.return_value`.
+by modifying the mock :attr:`~Mock.return_value`.
>>> def some_function():
... instance = module.Foo()
diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
index f00d29f..ed6775a 100644
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -236,10 +236,10 @@ the `new_callable` argument to `patch`.
* `wraps`: Item for the mock object to wrap. If `wraps` is not None then
calling the Mock will pass the call through to the wrapped object
- (returning the real result and ignoring `return_value`). Attribute access
- on the mock will return a Mock object that wraps the corresponding
- attribute of the wrapped object (so attempting to access an attribute
- that doesn't exist will raise an `AttributeError`).
+ (returning the real result). Attribute access on the mock will return a
+ Mock object that wraps the corresponding attribute of the wrapped
+ object (so attempting to access an attribute that doesn't exist will
+ raise an `AttributeError`).
If the mock has an explicit `return_value` set then calls are not passed
to the wrapped object and the `return_value` is returned instead.