merge 3.4
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 36ae1ef..3ba7c01 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -146,10 +146,10 @@
)
if not _have_ssl:
raise ValueError('SSL support not available')
- context = ssl._create_stdlib_context(cert_reqs=ssl.CERT_REQUIRED,
+ context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH,
cafile=cafile,
capath=capath)
- https_handler = HTTPSHandler(context=context, check_hostname=True)
+ https_handler = HTTPSHandler(context=context)
opener = build_opener(https_handler)
elif context:
https_handler = HTTPSHandler(context=context)