diff options
| -rw-r--r-- | Lib/urlparse.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/urlparse.py b/Lib/urlparse.py index 22a5fd0..560028d 100644 --- a/Lib/urlparse.py +++ b/Lib/urlparse.py @@ -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)) |