mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 10:21:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Quote/unquote slashes in macintosh pathname components (Jack Jansen).

Browse source
This commit is contained in:
Guido van Rossum 1998-08-06 13:37:21 +00:00
parent 9c241ba014
commit 4ff6d27319
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/macurl2path.py
View file

@ -29,7 +29,7 @@ def url2pathname(pathname):
i = i+1 i = i+1
if not components[0]: if not components[0]:
# Absolute unix path, don't start with colon # Absolute unix path, don't start with colon
return string.join(components[1:], ':') rv = string.join(components[1:], ':')
else: else:
# relative unix path, start with colon. First replace # relative unix path, start with colon. First replace
# leading .. by empty strings (giving ::file) # leading .. by empty strings (giving ::file)
@ -37,7 +37,9 @@ def url2pathname(pathname):
while i < len(components) and components[i] == '..': while i < len(components) and components[i] == '..':
components[i] = '' components[i] = ''
i = i + 1 i = i + 1
return ':' + string.join(components, ':') rv = ':' + string.join(components, ':')
# and finally unquote slashes and other funny characters
return urllib.unquote(rv)
def pathname2url(pathname): def pathname2url(pathname):
"convert mac pathname to /-delimited pathname" "convert mac pathname to /-delimited pathname"
@ -54,13 +56,17 @@ def pathname2url(pathname):
if components[i] == '': if components[i] == '':
components[i] = '..' components[i] = '..'
# Truncate names longer than 31 bytes # Truncate names longer than 31 bytes
components = map(lambda x: x[:31], components) components = map(_pncomp2url, components)
if os.path.isabs(pathname): if os.path.isabs(pathname):
return '/' + string.join(components, '/') return '/' + string.join(components, '/')
else: else:
return string.join(components, '/') return string.join(components, '/')
def _pncomp2url(component):
component = urllib.quote(component[:31], safe='') # We want to quote slashes
return component
def test(): def test():
for url in ["index.html", for url in ["index.html",
"bar/index.html", "bar/index.html",