follow-up of r64385: rename urllib.quote in nturl2path

and remove assertions & debugger when ssl is not present

diff --git a/Lib/nturl2path.py b/Lib/nturl2path.py
index 9dde29966b188479494dccd85989e840cc6c0165..1cfe827c6d681d6381885ea07628d5beaea29726 100644 (file)
--- a/Lib/nturl2path.py
+++ b/Lib/nturl2path.py
@@ -7,7 +7,7 @@ def url2pathname(url):
     # ///C|/foo/bar/spam.foo
     # becomes
     # C:\foo\bar\spam.foo
-    import string, urllib
+    import string, urllib.parse
     # Windows itself uses ":" even in URLs.
     url = url.replace(':', '|')
     if not '|' in url:
@@ -19,7 +19,7 @@ def url2pathname(url):
             url = url[2:]
         components = url.split('/')
         # make sure not to convert quoted slashes :-)
-        return urllib.unquote('\\'.join(components))
+        return urllib.parse.unquote('\\'.join(components))
     comp = url.split('|')
     if len(comp) != 2 or comp[0][-1] not in string.ascii_letters:
         error = 'Bad URL: ' + url
@@ -29,7 +29,7 @@ def url2pathname(url):
     path = drive + ':'
     for  comp in components:
         if comp:
-            path = path + '\\' + urllib.unquote(comp)
+            path = path + '\\' + urllib.parse.unquote(comp)
     return path
 
 def pathname2url(p):
@@ -39,7 +39,7 @@ def pathname2url(p):
     # C:\foo\bar\spam.foo
     # becomes
     # ///C|/foo/bar/spam.foo
-    import urllib
+    import urllib.parse
     if not ':' in p:
         # No drive specifier, just convert slashes and quote the name
         if p[:2] == '\\\\':
@@ -48,16 +48,16 @@ def pathname2url(p):
         # (notice doubling of slashes at the start of the path)
             p = '\\\\' + p
         components = p.split('\\')
-        return urllib.quote('/'.join(components))
+        return urllib.parse.quote('/'.join(components))
     comp = p.split(':')
     if len(comp) != 2 or len(comp[0]) > 1:
         error = 'Bad path: ' + p
         raise IOError(error)
 
-    drive = urllib.quote(comp[0].upper())
+    drive = urllib.parse.quote(comp[0].upper())
     components = comp[1].split('\\')
     path = '///' + drive + '|'
     for comp in components:
         if comp:
-            path = path + '/' + urllib.quote(comp)
+            path = path + '/' + urllib.parse.quote(comp)
     return path

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index cd4729a95e85c8828ce87c2854e9036014b7332a..da1314786b6fcbecd3564e1286b230f15d81f6b4 100644 (file)
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -105,7 +105,6 @@ except:
     _have_ssl = False
 else:
     _have_ssl = True
-assert _have_ssl
 
 # used in User-Agent header sent
 __version__ = sys.version[:3]
@@ -417,8 +416,6 @@ def build_opener(*handlers):
                        FTPHandler, FileHandler, HTTPErrorProcessor]
     if hasattr(http.client, "HTTPSConnection"):
         default_classes.append(HTTPSHandler)
-    else:
-        import pdb; pdb.set_trace()
     skip = set()
     for klass in default_classes:
         for check in handlers: