New upstream version 2017.02.07

[youtubedl] / youtube_dl / extractor / youku.py

diff --git a/youtube_dl/extractor/youku.py b/youtube_dl/extractor/youku.py
index 147608ebebbbe8b71dda64e2daf974362868c50c..e37f237c76c6880eb1d442e8302dcef558d0e9d8 100644 (file)
--- 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,
 from ..utils import (
     ExtractorError,
     get_element_by_attribute,

-    sanitized_Request,

 )
 
 
 )
 
 


@@ -218,14 +217,10 @@ class YoukuIE(InfoExtractor):
             headers = {
                 'Referer': req_url,
             }
             headers = {
                 'Referer': req_url,
             }

+            headers.update(self.geo_verification_headers())

             self._set_cookie('youku.com', 'xreferrer', 'http://www.youku.com')
             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']
 
 
             return raw_data['data']