mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 19:25:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

From: Sjoerd Mullender

Browse source 
The filename to URL conversion didn't properly quote special
characters.
The URL to filename didn't properly unquote special chatacters.
This commit is contained in:
Guido van Rossum 1999-03-12 14:31:10 +00:00
parent f61bbc8182
commit 367ac80d3b
2 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Lib/nturl2path.py
View file

@ -10,21 +10,22 @@ def url2pathname(url):
C:\foo\bar\spam.foo C:\foo\bar\spam.foo
""" """
import string import string, urllib
if not '|' in url: if not '|' in url:
# No drive specifier, just convert slashes # No drive specifier, just convert slashes
components = string.splitfields(url, '/') components = string.split(url, '/')
return string.joinfields(components, '\\') # make sure not to convert quoted slashes :-)
comp = string.splitfields(url, '|') return urllib.unquote(string.join(components, '\\'))
comp = string.split(url, '|')
if len(comp) != 2 or comp[0][-1] not in string.letters: if len(comp) != 2 or comp[0][-1] not in string.letters:
error = 'Bad URL: ' + url error = 'Bad URL: ' + url
raise IOError, error raise IOError, error
drive = string.upper(comp[0][-1]) drive = string.upper(comp[0][-1])
components = string.splitfields(comp[1], '/') components = string.split(comp[1], '/')
path = drive + ':' path = drive + ':'
for comp in components: for comp in components:
if comp: if comp:
path = path + '\\' + comp path = path + '\\' + urllib.unquote(comp)
return path return path
def pathname2url(p): def pathname2url(p):
@ -37,20 +38,20 @@ def pathname2url(p):
///C|/foo/bar/spam.foo ///C|/foo/bar/spam.foo
""" """
import string import string, urllib
if not ':' in p: if not ':' in p:
# No drive specifier, just convert slashes # No drive specifier, just convert slashes and quote the name
components = string.splitfields(p, '\\') components = string.split(p, '\\')
return string.joinfields(components, '/') return urllib.quote(string.join(components, '/'))
comp = string.splitfields(p, ':') comp = string.split(p, ':')
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 = string.upper(comp[0]) drive = urllib.quote(string.upper(comp[0]))
components = string.splitfields(comp[1], '\\') components = string.split(comp[1], '\\')
path = '///' + drive + '|' path = '///' + drive + '|'
for comp in components: for comp in components:
if comp: if comp:
path = path + '/' + comp path = path + '/' + urllib.quote(comp)
return path return path

11
Lib/urllib.py
View file

@ -38,16 +38,9 @@ elif os.name == 'nt':
from nturl2path import url2pathname, pathname2url from nturl2path import url2pathname, pathname2url
else: else:
def url2pathname(pathname): def url2pathname(pathname):
return pathname return unquote(pathname)
def pathname2url(pathname): def pathname2url(pathname):
return pathname return quote(pathname)
_url2pathname = url2pathname
def url2pathname(url):
return _url2pathname(unquote(url))
_pathname2url = pathname2url
def pathname2url(p):
return quote(_pathname2url(p))
# This really consists of two pieces: # This really consists of two pieces:
# (1) a class which handles opening of all sorts of URLs # (1) a class which handles opening of all sorts of URLs