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

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

and remove assertions & debugger when ssl is not present
This commit is contained in:
Amaury Forgeot d'Arc 2008-06-18 22:38:24 +00:00
parent cb0d2d7198
commit c80902eac8
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/nturl2path.py
View File

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

3
Lib/urllib/request.py
View File

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