From: Sergey M. Date: Tue, 17 Mar 2015 13:58:34 +0000 (+0600) Subject: Merge pull request #5116 from yan12125/letv_fix X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=cf47794f09ca13bfb16acc0903f13530a3f2d0f8;hp=c06a9f8730f41fb24835d482114403f227bc8421 Merge pull request #5116 from yan12125/letv_fix [Letv] Fix test_Letv and test_Letv_1 failures in python 3 --- diff --git a/youtube_dl/extractor/letv.py b/youtube_dl/extractor/letv.py index 85eee141b..9ed81a199 100644 --- a/youtube_dl/extractor/letv.py +++ b/youtube_dl/extractor/letv.py @@ -88,9 +88,10 @@ class LetvIE(InfoExtractor): play_json_req = compat_urllib_request.Request( 'http://api.letv.com/mms/out/video/playJson?' + compat_urllib_parse.urlencode(params) ) - play_json_req.add_header( - 'Ytdl-request-proxy', - self._downloader.params.get('cn_verification_proxy')) + cn_verification_proxy = self._downloader.params.get('cn_verification_proxy') + if cn_verification_proxy: + play_json_req.add_header('Ytdl-request-proxy', cn_verification_proxy) + play_json = self._download_json( play_json_req, media_id, 'playJson data')