diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2017-01-06 17:16:07 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2017-01-06 17:16:07 (GMT) |
commit | cd992bbe73dbbca356a94cf920f55012e5db689e (patch) | |
tree | 1277329e785fbf6a5f2fdf85b191d950b9dfa060 /Lib/unittest/mock.py | |
parent | b27df6faa5e5b92674cdf629615595cecd33d875 (diff) | |
parent | 84b6fb0eea29b3b28a1a11124526b01ec0c9d17a (diff) | |
download | cpython-cd992bbe73dbbca356a94cf920f55012e5db689e.zip cpython-cd992bbe73dbbca356a94cf920f55012e5db689e.tar.gz cpython-cd992bbe73dbbca356a94cf920f55012e5db689e.tar.bz2 |
Merge 3.6
Diffstat (limited to 'Lib/unittest/mock.py')
-rw-r--r-- | Lib/unittest/mock.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 367c1e1..dbb05d7 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -1951,9 +1951,8 @@ class _Call(tuple): If the _Call has no name then it will match any name. """ - def __new__(cls, value=(), name=None, parent=None, two=False, + def __new__(cls, value=(), name='', parent=None, two=False, from_kall=True): - name = '' args = () kwargs = {} _len = len(value) |