diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-24 14:10:51 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-24 14:10:51 (GMT) |
| commit | 89e6b3184552e8277b416b848e56ec4a559b29b3 (patch) | |
| tree | c7917743d0af56d0429bd5d7024d3b765dcee19f /Lib/unittest | |
| parent | d6f1d1647bce43b8c0d4cb1ba6d9c3004b3e357d (diff) | |
| parent | 31a7835df826ce90642fb7302a1168ac10f3b780 (diff) | |
| download | cpython-89e6b3184552e8277b416b848e56ec4a559b29b3.zip cpython-89e6b3184552e8277b416b848e56ec4a559b29b3.tar.gz cpython-89e6b3184552e8277b416b848e56ec4a559b29b3.tar.bz2 | |
#17504: merge with 3.3.
Diffstat (limited to 'Lib/unittest')
| -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 2b1effb..5a1db8a 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -973,9 +973,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. |