about summary refs log tree commit diff
path: root/youtube_dl/extractor/youku.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-07-03 23:23:48 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-07-03 23:29:56 +0800
commit38cce791c71e9da33854e56114233d60345e18c0 (patch)
tree51eb94d8b539d4646a66c347bf0b3f2651b2cf80 /youtube_dl/extractor/youku.py
parentbf3ae6a543ee8825308e8427f60fceb125a77ab5 (diff)
downloadyoutube-dl-38cce791c71e9da33854e56114233d60345e18c0.tar.gz
youtube-dl-38cce791c71e9da33854e56114233d60345e18c0.tar.xz
youtube-dl-38cce791c71e9da33854e56114233d60345e18c0.zip
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.
Diffstat (limited to 'youtube_dl/extractor/youku.py')
-rw-r--r--youtube_dl/extractor/youku.py9
1 files changed, 2 insertions, 7 deletions
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']