From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 27 Sep 2014 19:07:42 +0000 (+0700)
Subject: [YoutubeDL] Expect all kind of strings in urlopen
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=68b09730461de20395cee9427dc469fa9edc4022;p=youtube-dl

[YoutubeDL] Expect all kind of strings in urlopen

Now it doesn't fail if req is python2's str
---

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(