From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 18 Feb 2016 06:18:35 +0000 (-0800)
Subject: merge 3.5 (closes #25939)
X-Git-Tag: v3.6.0a1~602
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a180a693f5e926784f65855734c4726839dcf48;p=python

merge 3.5 (closes #25939)
---

4a180a693f5e926784f65855734c4726839dcf48
diff --cc Misc/NEWS
index 70ec5929e9,20be1177da..467b876332
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -186,16 -75,11 +186,18 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #25939: On Windows open the cert store readonly in ssl.enum_certificates.
+ 
  - Issue #25995: os.walk() no longer uses FDs proportional to the tree depth.
  
 +- Issue #25994: Added the close() method and the support of the context manager
 +  protocol for the os.scandir() iterator.
 +
 +- Issue #23992: multiprocessing: make MapResult not fail-fast upon exception.
 +
 +- Issue #26243: Support keyword arguments to zlib.compress().  Patch by Aviv
 +  Palivoda.
 +
  - Issue #26117: The os.scandir() iterator now closes file descriptor not only
    when the iteration is finished, but when it was failed with error.