From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 3 Oct 2014 21:33:45 +0000 (-0400)
Subject: merge 3.4 (#22449)
X-Git-Tag: v3.5.0a1~771
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b9cfa10662c7712f7685f4bc376ab65c119589b;p=python

merge 3.4 (#22449)
---

8b9cfa10662c7712f7685f4bc376ab65c119589b
diff --cc Misc/NEWS
index f66a51ea79,5934d5bc32..65d6b2119e
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -159,23 -57,6 +159,26 @@@ Core and Builtin
  Library
  -------
  
++- Issue #22449: In the ssl.SSLContext.load_default_certs, consult the
++  enviromental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows.
++
 +- Issue #22508: The email.__version__ variable has been removed; the email
 +  code is no longer shipped separately from the stdlib, and __version__
 +  hasn't been updated in several releases.
 +
 +- Issue #20076: Added non derived UTF-8 aliases to locale aliases table.
 +
 +- Issue #20079: Added locales supported in glibc 2.18 to locale alias table.
 +
 +- Issue #20218: Added convenience methods read_text/write_text and read_bytes/
 +  write_bytes to pathlib.Path objects.
 +
 +- Issue #22437: Number of capturing groups in regular expression is no longer
 +  limited by 100.
 +
 +- Issue #17442: InteractiveInterpreter now displays the full chained traceback
 +  in its showtraceback method, to match the built in interactive interpreter.
 +
  - Issue #10510: distutils register and upload methods now use HTML standards
    compliant CRLF line endings.