]> 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:17:25 +0000 (23:17 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 21 Jan 2017 21:17:25 +0000 (23:17 +0200)
1  2 
Lib/unittest/mock.py
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
index cb2ac8577816ffa70b8c301860ab671c067137ca,d829a56b282a5745b485e9aa9cb69c2e26e240aa..6c2b43500f7e542f4516db0dd12f8157e30b6af7
+++ b/Misc/NEWS
@@@ -215,10 -47,10 +215,12 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #29316: Restore the provisional status of typing module, add
 -  corresponding note to documentation. Patch by Ivan L.
+ - Issue #28735: Fixed the comparison of mock.MagickMock with mock.ANY.
 +- Issue #29197: Removed deprecated function ntpath.splitunc().
 +
 +- Issue #29210: Removed support of deprecated argument "exclude" in
 +  tarfile.TarFile.add().
  
  - Issue #29219: Fixed infinite recursion in the repr of uninitialized
    ctypes.CDLL instances.