diff options
| -rw-r--r-- | Lib/nturl2path.py | 29 | ||||
| -rw-r--r-- | Lib/urllib.py | 11 |
2 files changed, 17 insertions, 23 deletions
diff --git a/Lib/nturl2path.py b/Lib/nturl2path.py index a25dc2a..d86bbc2 100644 --- a/Lib/nturl2path.py +++ b/Lib/nturl2path.py @@ -10,21 +10,22 @@ def url2pathname(url): C:\foo\bar\spam.foo """ - import string + import string, urllib if not '|' in url: # No drive specifier, just convert slashes - components = string.splitfields(url, '/') - return string.joinfields(components, '\\') - comp = string.splitfields(url, '|') + components = string.split(url, '/') + # make sure not to convert quoted slashes :-) + return urllib.unquote(string.join(components, '\\')) + comp = string.split(url, '|') if len(comp) != 2 or comp[0][-1] not in string.letters: error = 'Bad URL: ' + url raise IOError, error drive = string.upper(comp[0][-1]) - components = string.splitfields(comp[1], '/') + components = string.split(comp[1], '/') path = drive + ':' for comp in components: if comp: - path = path + '\\' + comp + path = path + '\\' + urllib.unquote(comp) return path def pathname2url(p): @@ -37,20 +38,20 @@ def pathname2url(p): ///C|/foo/bar/spam.foo """ - import string + import string, urllib if not ':' in p: - # No drive specifier, just convert slashes - components = string.splitfields(p, '\\') - return string.joinfields(components, '/') - comp = string.splitfields(p, ':') + # No drive specifier, just convert slashes and quote the name + components = string.split(p, '\\') + return urllib.quote(string.join(components, '/')) + comp = string.split(p, ':') if len(comp) != 2 or len(comp[0]) > 1: error = 'Bad path: ' + p raise IOError, error - drive = string.upper(comp[0]) - components = string.splitfields(comp[1], '\\') + drive = urllib.quote(string.upper(comp[0])) + components = string.split(comp[1], '\\') path = '///' + drive + '|' for comp in components: if comp: - path = path + '/' + comp + path = path + '/' + urllib.quote(comp) return path diff --git a/Lib/urllib.py b/Lib/urllib.py index ceacc61..a484736 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -38,16 +38,9 @@ elif os.name == 'nt': from nturl2path import url2pathname, pathname2url else: def url2pathname(pathname): - return pathname + return unquote(pathname) def pathname2url(pathname): - return pathname - -_url2pathname = url2pathname -def url2pathname(url): - return _url2pathname(unquote(url)) -_pathname2url = pathname2url -def pathname2url(p): - return quote(_pathname2url(p)) + return quote(pathname) # This really consists of two pieces: # (1) a class which handles opening of all sorts of URLs |