[Python-checkins] cpython (merge 3.3 -> default): #17504: merge with 3.3.

Sun Mar 24 15:11:05 CET 2013

http://hg.python.org/cpython/rev/2fc34f3dbc9d
changeset: 82941:2fc34f3dbc9d
parent: 82937:ace52be8da89
parent: 82940:9445505389cf
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Sun Mar 24 16:10:51 2013 +0200
summary:
 #17504: merge with 3.3.
files:
 Lib/unittest/mock.py | 3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -973,9 +973,6 @@
 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.
-- 
Repository URL: http://hg.python.org/cpython
