Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Patch my Marc Lemburg to fix urljoin("/a", "..") and urljoin("/a", "..#1").

This commit is contained in:
Guido van Rossum 1997-12-03 22:38:56 +00:00
parent 3fa440ea91
commit e612be5926
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/urlparse.py
View File

@ -151,7 +151,9 @@ def urljoin(base, url, allow_framents = 1):
i = i+1
else:
break
if len(segments) >= 2 and segments[-1] == '..':
if len(segments) == 2 and segments[1] == '..' and segments[0] == '':
segments[-1] = ''
elif len(segments) >= 2 and segments[-1] == '..':
segments[-2:] = ['']
return urlunparse((scheme, netloc, joinfields(segments, '/'),
params, query, fragment))