Sirius/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[utils] Improve urljoin

Browse source
This commit is contained in:
Sergey M․ 2016-12-17 18:44:53 +07:00
parent 594601f545
commit b0c65c677f
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
youtube_dl/utils.py
View file

@ -1703,9 +1703,9 @@ def base_url(url):
def urljoin(base, path):
if not isinstance(path, compat_str) or not path:
return None
if re.match(r'https?://', path):
if re.match(r'^(?:https?:)?//', path):
return path
if not isinstance(base, compat_str) or not re.match(r'https?://', base):
if not isinstance(base, compat_str) or not re.match(r'^(?:https?:)?//', base):
return None
return compat_urlparse.urljoin(base, path)