From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 7 Dec 2014 18:47:34 +0000 (-0500)
Subject: merge 3.4 (#22959)
X-Git-Tag: v3.5.0a1~365
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b46247bee518487abcc9e17925d28d682b8e08ac;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#22959)
---

b46247bee518487abcc9e17925d28d682b8e08ac
diff --cc Misc/NEWS
index 840055084d99,732236dab5c3..6de856cad265
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -194,9 -39,9 +194,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #22959: In the constructor of http.client.HTTPSConnection, prefer the
+   context's check_hostname attribute over the *check_hostname* parameter.
+ 
 +- Issue #22696: Add function :func:`sys.is_finalizing` to know about
 +  interpreter shutdown.
 +
  - Issue #16043: Add a default limit for the amount of data xmlrpclib.gzip_decode
    will return. This resolves CVE-2013-1753.