summaryrefslogtreecommitdiffstats
path: root/Lib/urllib
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2014-09-19 07:23:30 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2014-09-19 07:23:30 (GMT)
commit8b7e161ac39b14abe0a06b69ae4e51d16649f628 (patch)
treef11f094eeb81e8fe236fec14ac2155b54978265e /Lib/urllib
parentcc23154d020723dc85d055324861f6a8f54fe0f7 (diff)
downloadcpython-8b7e161ac39b14abe0a06b69ae4e51d16649f628.zip
cpython-8b7e161ac39b14abe0a06b69ae4e51d16649f628.tar.gz
cpython-8b7e161ac39b14abe0a06b69ae4e51d16649f628.tar.bz2
backport context argument of urlopen (#22366) for pep 476
Diffstat (limited to 'Lib/urllib')
-rw-r--r--Lib/urllib/request.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 67c7566..e0c8116 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -136,9 +136,14 @@ __version__ = sys.version[:3]
_opener = None
def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
- *, cafile=None, capath=None, cadefault=False):
+ *, cafile=None, capath=None, cadefault=False, context=None):
global _opener
if cafile or capath or cadefault:
+ if context is not None:
+ raise ValueError(
+ "You can't pass both context and any of cafile, capath, and "
+ "cadefault"
+ )
if not _have_ssl:
raise ValueError('SSL support not available')
context = ssl._create_stdlib_context(cert_reqs=ssl.CERT_REQUIRED,
@@ -146,6 +151,9 @@ def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
capath=capath)
https_handler = HTTPSHandler(context=context, check_hostname=True)
opener = build_opener(https_handler)
+ elif context:
+ https_handler = HTTPSHandler(context=context)
+ opener = build_opener(https_handler)
elif _opener is None:
_opener = opener = build_opener()
else: