From 38cce791c71e9da33854e56114233d60345e18c0 Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Sun, 3 Jul 2016 23:23:48 +0800 Subject: Rename --cn-verfication-proxy to --geo-verification-proxy And deprecate the former one Since commit f1388739002a7fd1e8e9c41b642734786fc6c391, this option is not limited to China websites, so rename it. --- youtube_dl/extractor/youku.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'youtube_dl/extractor/youku.py') diff --git a/youtube_dl/extractor/youku.py b/youtube_dl/extractor/youku.py index 147608ebe..e37f237c7 100644 --- a/youtube_dl/extractor/youku.py +++ b/youtube_dl/extractor/youku.py @@ -16,7 +16,6 @@ from ..compat import ( from ..utils import ( ExtractorError, get_element_by_attribute, - sanitized_Request, ) @@ -218,14 +217,10 @@ class YoukuIE(InfoExtractor): headers = { 'Referer': req_url, } + headers.update(self.geo_verification_headers()) self._set_cookie('youku.com', 'xreferrer', 'http://www.youku.com') - req = sanitized_Request(req_url, headers=headers) - cn_verification_proxy = self._downloader.params.get('cn_verification_proxy') - if cn_verification_proxy: - req.add_header('Ytdl-request-proxy', cn_verification_proxy) - - raw_data = self._download_json(req, video_id, note=note) + raw_data = self._download_json(req_url, video_id, note=note, headers=headers) return raw_data['data'] -- cgit v1.2.3