Merged revisions 87329 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87329 | senthil.kumaran | 2010-12-17 12:48:45 +0800 (Fri, 17 Dec 2010) | 3 lines
Fix Issue9721 - urljoin behavior when the relative url starts with ';'
........
diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 4ac9867..a019a7b 100644
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -256,14 +256,9 @@
if path[:1] == '/':
return urlunparse((scheme, netloc, path,
params, query, fragment))
- if not path:
+ if not path and not params:
path = bpath
- if not params:
- params = bparams
- else:
- path = path[:-1]
- return urlunparse((scheme, netloc, path,
- params, query, fragment))
+ params = bparams
if not query:
query = bquery
return urlunparse((scheme, netloc, path,