From: Michael Foord <michael@voidspace.org.uk>
Date: Tue, 15 Apr 2014 21:22:22 +0000 (-0400)
Subject: Merge
X-Git-Tag: v3.5.0a1~1859
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15f2d1775e64b3ae0742f0faae108bc3d6e3d5e4;p=thirdparty%2FPython%2Fcpython.git

Merge
---

15f2d1775e64b3ae0742f0faae108bc3d6e3d5e4
diff --cc Misc/NEWS
index f982711a302b,1c4a80339e92..4da2333237b9
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -46,9 -37,9 +46,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #21239: patch.stopall() didn't work deterministically when the same
+   name was patched more than once.
+ 
 +- Issue #21203: Updated fileConfig and dictConfig to remove inconsistencies.
 +  Thanks to Jure Koren for the patch.
-   
++
  - Issue #21222: Passing name keyword argument to mock.create_autospec now
    works.