diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-12-17 04:54:43 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-12-17 04:54:43 (GMT) |
| commit | 3396e8671d15ff90f0197a4215bb14e48a593837 (patch) | |
| tree | 0ba5034fe2cfc559b385a372a886d0643dc240be /Lib/urllib | |
| parent | 115a3170c46f0281890f1ddbead443261fe309a0 (diff) | |
| download | cpython-3396e8671d15ff90f0197a4215bb14e48a593837.zip cpython-3396e8671d15ff90f0197a4215bb14e48a593837.tar.gz cpython-3396e8671d15ff90f0197a4215bb14e48a593837.tar.bz2 | |
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 ';'
........
Diffstat (limited to 'Lib/urllib')
| -rw-r--r-- | Lib/urllib/parse.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index cfd47f9..e8e9cc7 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, |