]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[YoutubeDL] Expect all kind of strings in urlopen
authorSergey M․ <dstftw@gmail.com>
Sat, 27 Sep 2014 19:07:42 +0000 (02:07 +0700)
committerSergey M․ <dstftw@gmail.com>
Sat, 27 Sep 2014 19:07:42 +0000 (02:07 +0700)
Now it doesn't fail if req is python2's str

youtube_dl/YoutubeDL.py

index a1713dc5ad7d3e8f79fe15223a88300b9f4434fb..b485dbdf1c61eda1b4b6817bce353f119a416e14 100755 (executable)
@@ -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(