summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2014-09-28 02:07:42 +0700
committerSergey M․ <dstftw@gmail.com>2014-09-28 02:07:42 +0700
commit68b09730461de20395cee9427dc469fa9edc4022 (patch)
treebeafd52c2d8bdbb393516127591e017588ffd19e
parent3a203b8bfaf8c21ec93e5b8ac431f1651038298a (diff)
downloadyoutube-dl-68b09730461de20395cee9427dc469fa9edc4022.tar.gz
youtube-dl-68b09730461de20395cee9427dc469fa9edc4022.tar.xz
youtube-dl-68b09730461de20395cee9427dc469fa9edc4022.zip
[YoutubeDL] Expect all kind of strings in urlopen
Now it doesn't fail if req is python2's str
-rwxr-xr-xyoutube_dl/YoutubeDL.py5
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(