From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Thu, 26 May 2016 09:22:40 +0000 (+0800)
Subject: [utils] Always decode Location header
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=0ea590076fd3b714b6a3345a28ac61d8be5e2afd;p=youtube-dl

[utils] Always decode Location header

escape_url is broken for bytes-like objects
---

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index cfb2d1bf5..6ab1747b3 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -861,6 +861,8 @@ class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
                 # As of RFC 2616 default charset is iso-8859-1 that is respected by python 3
                 if sys.version_info >= (3, 0):
                     location = location.encode('iso-8859-1').decode('utf-8')
+                else:
+                    location = location.decode('utf-8')
                 location_escaped = escape_url(location)
                 if location != location_escaped:
                     del resp.headers['Location']