(original) (raw)

changeset: 83102:fc39b8f0348d branch: 3.3 parent: 83098:40f582a73901 user: Senthil Kumaran senthil@uthcode.com date: Thu Apr 04 19:34:02 2013 -0700 files: Lib/urllib/request.py description: Issue #17483: 3.3 Branch - Remove unreachable code in urllib.request diff -r 40f582a73901 -r fc39b8f0348d Lib/urllib/request.py --- a/Lib/urllib/request.py Thu Apr 04 09:16:15 2013 +0300 +++ b/Lib/urllib/request.py Thu Apr 04 19:34:02 2013 -0700 @@ -142,16 +142,12 @@ 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() /senthil@uthcode.com