diff options
| -rw-r--r-- | Doc/library/unittest.mock-examples.rst | 2 | ||||
| -rw-r--r-- | Doc/library/unittest.mock.rst | 8 | ||||
| -rw-r--r-- | Lib/unittest/mock.py | 12 |
3 files changed, 11 insertions, 11 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. diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 04eba91..8cedcb4 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -941,12 +941,12 @@ class Mock(CallableMixin, NonCallableMock): this is a new Mock (created on first access). See the `return_value` attribute. - * `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`). + * `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). 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. |