traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #17483: remove unreachable code in urlopen().

This commit is contained in:
Antoine Pitrou 2013-04-01 18:55:35 +02:00
parent 7d197de987
commit 9a8d6934df
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/urllib/request.py
View File

@ -143,16 +143,12 @@ def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
raise ValueError('SSL support not available') raise ValueError('SSL support not available')
context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
context.options |= ssl.OP_NO_SSLv2 context.options |= ssl.OP_NO_SSLv2
if cafile or capath or cadefault: context.verify_mode = ssl.CERT_REQUIRED
context.verify_mode = ssl.CERT_REQUIRED if cafile or capath:
if cafile or capath: context.load_verify_locations(cafile, capath)
context.load_verify_locations(cafile, capath)
else:
context.set_default_verify_paths()
check_hostname = True
else: else:
check_hostname = False context.set_default_verify_paths()
https_handler = HTTPSHandler(context=context, check_hostname=check_hostname) https_handler = HTTPSHandler(context=context, check_hostname=True)
opener = build_opener(https_handler) opener = build_opener(https_handler)
elif _opener is None: elif _opener is None:
_opener = opener = build_opener() _opener = opener = build_opener()