Mercurial > cpython-lru_cache-weakref
diff Lib/urlparse.py @ 2900:0acbd85bcdba legacy-trunk
subtle changes to relative rurl joins
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Fri, 04 Aug 1995 04:29:32 +0000 |
| parents | f18c1915c722 |
| children | f72abd62d508 |
line wrap: on
line diff
--- a/Lib/urlparse.py Fri Aug 04 04:29:05 1995 +0000 +++ b/Lib/urlparse.py Fri Aug 04 04:29:32 1995 +0000 @@ -68,6 +68,7 @@ # 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 @@ 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] = ''