summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Foord <michael@voidspace.org.uk>2012-04-13 20:50:36 +0100
committerMichael Foord <michael@voidspace.org.uk>2012-04-13 20:50:36 +0100
commit99fe12f44508f57c7e7d98e6c68e7f3fe4fa9b52 (patch)
tree9f076bc1a363ad2ef22331563560fa7e6fc560d3
parentca802d006a5b44863740a8c894e1f456aa66afd5 (diff)
downloadmock-99fe12f44508f57c7e7d98e6c68e7f3fe4fa9b52.tar.gz
Docstring update
-rw-r--r--mock.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/mock.py b/mock.py
index a93b032..6e9c18a 100644
--- a/mock.py
+++ b/mock.py
@@ -1032,12 +1032,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.