From: Guido van Rossum <guido@python.org>
Date: Fri, 4 Aug 1995 04:29:32 +0000 (+0000)
Subject: subtle changes to relative rurl joins
X-Git-Tag: v1.3b1~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb1a0cd74f0cd6ddf7c4b6604e6f4e629669446a;p=thirdparty%2FPython%2Fcpython.git

subtle changes to relative rurl joins
---

diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 9fce0bd8517e..ef2384b08f82 100644
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -68,6 +68,7 @@ def urlparse(url, scheme = '', allow_framents = 1):
 # 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 @@ def urljoin(base, url, allow_framents = 1):
 		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] = ''