#17504: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-03-24 16:10:51 +02:00
commit 89e6b31845

View File

@ -973,9 +973,6 @@ class Mock(CallableMixin, NonCallableMock):
the next value from the iterable. If any of the members of the iterable the next value from the iterable. If any of the members of the iterable
are exceptions they will be raised instead of returned. 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 * `return_value`: The value returned when the mock is called. By default
this is a new Mock (created on first access). See the this is a new Mock (created on first access). See the
`return_value` attribute. `return_value` attribute.