]> granicus.if.org Git - python/commitdiff
Issue #28735: Fixed the comparison of mock.MagickMock with mock.ANY.
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 21 Jan 2017 21:15:18 +0000 (23:15 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 21 Jan 2017 21:15:18 +0000 (23:15 +0200)
1  2 
Lib/unittest/mock.py
Lib/unittest/test/testmock/testmock.py
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
index ed39fce1995d06672a9485261e266aef545df44e,84fa9d1b9fda9c2df62504d88ab4c87454066e90..d829a56b282a5745b485e9aa9cb69c2e26e240aa
+++ b/Misc/NEWS
@@@ -47,8 -13,9 +47,10 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #29011:  Fix an important omission by adding Deque to the typing module.
+ - Issue #28735: Fixed the comparison of mock.MagickMock with mock.ANY.
 +- Issue #29316: Restore the provisional status of typing module, add
 +  corresponding note to documentation. Patch by Ivan L.
  
  - Issue #29219: Fixed infinite recursion in the repr of uninitialized
    ctypes.CDLL instances.