X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2FYoutubeDL.py;h=4a9610355aea878cb7daa68abd2f65e398cbee69;hb=18937a50a4d453d48b018b9e68f40cd6d0959e31;hp=a1713dc5ad7d3e8f79fe15223a88300b9f4434fb;hpb=34e14a9beb3abe76bcda1154030978979c6c1d1d;p=youtube-dl.git

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index a1713dc5a..4a9610355 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 if sys.version_info < (3, 0) else compat_str)
+        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(