diff options
author | Sergey M․ <dstftw@gmail.com> | 2017-03-06 03:57:46 +0700 |
---|---|---|
committer | Sergey M․ <dstftw@gmail.com> | 2017-03-06 03:57:46 +0700 |
commit | 4b5de77bdb7765df4797bf068592926285ba709a (patch) | |
tree | 92695bf40e9b18e7558cd439106cece72a309855 /youtube_dl | |
parent | 96182695e4e37795a30ab143129c91dab18a9865 (diff) |
[utils] Process bytestrings in urljoin (closes #12369)
Diffstat (limited to 'youtube_dl')
-rw-r--r-- | youtube_dl/utils.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 8738aa249..d293c7498 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1748,11 +1748,16 @@ def base_url(url): def urljoin(base, path): + if isinstance(path, bytes): + path = path.decode('utf-8') if not isinstance(path, compat_str) or not path: return None if re.match(r'^(?:https?:)?//', path): return path - if not isinstance(base, compat_str) or not re.match(r'^(?:https?:)?//', base): + if isinstance(base, bytes): + base = base.decode('utf-8') + if not isinstance(base, compat_str) or not re.match( + r'^(?:https?:)?//', base): return None return compat_urlparse.urljoin(base, path) |