summaryrefslogtreecommitdiff
path: root/Lib/unittest/mock.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-01-21 23:17:25 +0200
committerSerhiy Storchaka <storchaka@gmail.com>2017-01-21 23:17:25 +0200
commit19dea2c726db6da2353678d8041aa2fff207b670 (patch)
treea382dbffca6d33b74358131b9caaa58830a45149 /Lib/unittest/mock.py
parent7cf8bebb07914408f71f6c0e0e1cf0a2eafa72d3 (diff)
parenta203360836df8110b6e0e4b8a8ed551fa2f0df06 (diff)
downloadcpython-git-19dea2c726db6da2353678d8041aa2fff207b670.tar.gz
Issue #28735: Fixed the comparison of mock.MagickMock with mock.ANY.
Diffstat (limited to 'Lib/unittest/mock.py')
-rw-r--r--Lib/unittest/mock.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 2ec14e555a..315b61157b 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -1765,14 +1765,18 @@ def _get_eq(self):
ret_val = self.__eq__._mock_return_value
if ret_val is not DEFAULT:
return ret_val
- return self is other
+ if self is other:
+ return True
+ return NotImplemented
return __eq__
def _get_ne(self):
def __ne__(other):
if self.__ne__._mock_return_value is not DEFAULT:
return DEFAULT
- return self is not other
+ if self is other:
+ return False
+ return NotImplemented
return __ne__
def _get_iter(self):