From a66e3885fb7bafbe69d738f500a63bd6718b0076 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Mon, 22 Sep 2014 15:49:16 +0800 Subject: Issue #22278: Fix urljoin problem with relative urls, a regression observed after changes to issue22118 were submitted. Patch contributed by Demian Brecht and reviewed by Antoine Pitrou. --- Lib/urllib/parse.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Lib/urllib/parse.py') diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index b6ac414dfd..8bbeab6200 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -443,6 +443,10 @@ def urljoin(base, url, allow_fragments=True): segments = path.split('/') else: segments = base_parts + path.split('/') + # filter out elements that would cause redundant slashes on re-joining + # the resolved_path + segments = segments[0:1] + [ + s for s in segments[1:-1] if len(s) > 0] + segments[-1:] resolved_path = [] @@ -465,7 +469,7 @@ def urljoin(base, url, allow_fragments=True): resolved_path.append('') return _coerce_result(urlunparse((scheme, netloc, '/'.join( - resolved_path), params, query, fragment))) + resolved_path) or '/', params, query, fragment))) def urldefrag(url): -- cgit v1.2.1