summaryrefslogtreecommitdiffstats
path: root/Lib/urllib.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/urllib.py')
-rw-r--r--Lib/urllib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py
index 651e37f..c49f032 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -350,13 +350,13 @@ class addinfo(addbase):
def basejoin(base, url):
type, path = splittype(url)
- if type: return url
host, path = splithost(path)
+ if type and host: return url
basetype, basepath = splittype(base)
basehost, basepath = splithost(basepath)
basepath, basetag = splittag(basepath)
basepath, basequery = splitquery(basepath)
- type = basetype or 'file'
+ if not type: type = basetype or 'file'
if path[:1] != '/':
i = string.rfind(basepath, '/')
if i < 0: basepath = '/'