From 3396e8671d15ff90f0197a4215bb14e48a593837 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Fri, 17 Dec 2010 04:54:43 +0000 Subject: 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 ';' ........ --- Lib/urllib/parse.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Lib/urllib/parse.py') diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index cfd47f9d92..e8e9cc7b92 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -249,14 +249,9 @@ def urljoin(base, url, allow_fragments=True): 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, -- cgit v1.2.1