[Python-checkins] cpython: Issue #17483: remove unreachable code in urlopen().

[antoine.pitrou]

http://hg.python.org/cpython/rev/4ed8a8e781c3
changeset:   83054:4ed8a8e781c3
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Mon Apr 01 18:55:35 2013 +0200
summary:
  Issue #17483: remove unreachable code in urlopen().

files:
  Lib/urllib/request.py |  14 +++++---------
  1 files changed, 5 insertions(+), 9 deletions(-)


diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -143,16 +143,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()

-- 
Repository URL: http://hg.python.org/cpython