From: Antoine Pitrou Date: Mon, 1 Apr 2013 16:55:35 +0000 (+0200) Subject: Issue #17483: remove unreachable code in urlopen(). X-Git-Tag: v3.4.0a1~1051^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a8d6934df77a6c45bd8d39e4919b93ba45e195d;p=python Issue #17483: remove unreachable code in urlopen(). --- diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 8b3cdf9d2c..5c875916df 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -143,16 +143,12 @@ def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, raise ValueError('SSL support not available') context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) context.options |= ssl.OP_NO_SSLv2 - if cafile or capath or cadefault: - context.verify_mode = ssl.CERT_REQUIRED - if cafile or capath: - context.load_verify_locations(cafile, capath) - else: - context.set_default_verify_paths() - check_hostname = True + context.verify_mode = ssl.CERT_REQUIRED + if cafile or capath: + context.load_verify_locations(cafile, capath) else: - check_hostname = False - https_handler = HTTPSHandler(context=context, check_hostname=check_hostname) + context.set_default_verify_paths() + https_handler = HTTPSHandler(context=context, check_hostname=True) opener = build_opener(https_handler) elif _opener is None: _opener = opener = build_opener()