summaryrefslogtreecommitdiffstats
path: root/Lib/urllib/parse.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/urllib/parse.py')
-rw-r--r--Lib/urllib/parse.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index 5b00ab2..a721d77 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -577,9 +577,9 @@ def urljoin(base, url, allow_fragments=True):
if scheme is None:
scheme = bscheme
- if scheme != bscheme or scheme not in uses_relative:
+ if scheme != bscheme or (scheme and scheme not in uses_relative):
return _coerce_result(url)
- if scheme in uses_netloc:
+ if not scheme or scheme in uses_netloc:
if netloc:
return _coerce_result(_urlunsplit(scheme, netloc, path,
query, fragment))