diff options
author | Sergey M․ <dstftw@gmail.com> | 2014-09-28 02:32:52 +0700 |
---|---|---|
committer | Sergey M․ <dstftw@gmail.com> | 2014-09-28 02:32:52 +0700 |
commit | b3ac3a51ac8c4a00186ef525253354eaaca0a553 (patch) | |
tree | 3dfc0966198be84dd15257a57206884381a84a45 /youtube_dl/YoutubeDL.py | |
parent | 2f9e8776df664e21aee18b05c468a56b03fe4417 (diff) | |
parent | 0b75c2a88ba56a84322db6cc1a298d7e52b44b2a (diff) | |
download | youtube-dl-b3ac3a51ac8c4a00186ef525253354eaaca0a553.tar.xz |
Merge branch 'lenaten-sport5'
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rwxr-xr-x | youtube_dl/YoutubeDL.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index a1713dc5a..b485dbdf1 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1250,12 +1250,13 @@ class YoutubeDL(object): # urllib chokes on URLs with non-ASCII characters (see http://bugs.python.org/issue3991) # To work around aforementioned issue we will replace request's original URL with # percent-encoded one - url = req if isinstance(req, compat_str) else req.get_full_url() + req_is_string = isinstance(req, basestring) + url = req if req_is_string else req.get_full_url() url_escaped = escape_url(url) # Substitute URL if any change after escaping if url != url_escaped: - if isinstance(req, compat_str): + if req_is_string: req = url_escaped else: req = compat_urllib_request.Request( |