diff options
Diffstat (limited to 'Lib/urlparse.py')
| -rw-r--r-- | Lib/urlparse.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/urlparse.py b/Lib/urlparse.py index 9fce0bd..ef2384b 100644 --- a/Lib/urlparse.py +++ b/Lib/urlparse.py @@ -68,6 +68,7 @@ def urlparse(url, scheme = '', allow_framents = 1): # states that these are equivalent). def urlunparse((scheme, netloc, url, params, query, fragment)): if netloc: + if url[:1] != '/': url = '/' + url url = '//' + netloc + url if scheme: url = scheme + ':' + url @@ -118,9 +119,8 @@ def urljoin(base, url, allow_framents = 1): return urlunparse((scheme, netloc, path, params, query, fragment)) i = string.rfind(bpath, '/') - if i < 0: - i = len(bpath) - path = bpath[:i] + '/' + path + if i >= 0: + path = bpath[:i] + '/' + path segments = string.splitfields(path, '/') if segments[-1] == '.': segments[-1] = '' |