diff options
| author | Georg Brandl <georg@python.org> | 2013-03-25 07:01:37 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-03-25 07:01:37 +0100 |
| commit | a809e4a54007303efb084b85ba53605adaa41b64 (patch) | |
| tree | d038bc1b85b83594b29f00ae5bc10b5290ffdf71 /Lib/unittest/mock.py | |
| parent | d08d0b1c69b19c58afb998e30eadfc7b9de26378 (diff) | |
| parent | 153866ea9ab80323d247a9c49d1fdf50e07e7330 (diff) | |
| download | cpython-git-3.3.1rc1.tar.gz | |
merge with upstream 3.3 branchv3.3.1rc1
Diffstat (limited to 'Lib/unittest/mock.py')
| -rw-r--r-- | Lib/unittest/mock.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 8361fdea8d..57bf957a98 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -948,9 +948,6 @@ class Mock(CallableMixin, NonCallableMock): the next value from the iterable. If any of the members of the iterable are exceptions they will be raised instead of returned. - If `side_effect` is an iterable then each call to the mock will return - the next value from the iterable. - * `return_value`: The value returned when the mock is called. By default this is a new Mock (created on first access). See the `return_value` attribute. |