projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7320 from remitamine/adobetv
[youtube-dl]
/
youtube_dl
/
extractor
/
youku.py
diff --git
a/youtube_dl/extractor/youku.py
b/youtube_dl/extractor/youku.py
index 6219bc1bb915ca17117c34fe7e7c98e915e2cfee..69ecc837a4d6d94c82a1055cb7cc41d6e6663763 100644
(file)
--- a/
youtube_dl/extractor/youku.py
+++ b/
youtube_dl/extractor/youku.py
@@
-4,12
+4,13
@@
from __future__ import unicode_literals
import base64
from .common import InfoExtractor
import base64
from .common import InfoExtractor
-from ..utils import ExtractorError
-
from ..compat import (
compat_urllib_parse,
compat_ord,
from ..compat import (
compat_urllib_parse,
compat_ord,
- compat_urllib_request,
+)
+from ..utils import (
+ ExtractorError,
+ sanitized_Request,
)
)
@@
-54,9
+55,9
@@
class YoukuIE(InfoExtractor):
'note': 'Video protected with password',
'info_dict': {
'id': 'XNjA1NzA2Njgw',
'note': 'Video protected with password',
'info_dict': {
'id': 'XNjA1NzA2Njgw',
- 'ext': 'flv',
- 'title': u'邢義田复旦讲座之想象中的胡人—从“左衽孔子”说起',
+ 'title': '邢義田复旦讲座之想象中的胡人—从“左衽孔子”说起',
},
},
+ 'playlist_count': 19,
'params': {
'videopassword': '100600',
},
'params': {
'videopassword': '100600',
},
@@
-187,7
+188,7
@@
class YoukuIE(InfoExtractor):
video_id = self._match_id(url)
def retrieve_data(req_url, note):
video_id = self._match_id(url)
def retrieve_data(req_url, note):
- req =
compat_urllib_request.
Request(req_url)
+ req =
sanitized_
Request(req_url)
cn_verification_proxy = self._downloader.params.get('cn_verification_proxy')
if cn_verification_proxy:
cn_verification_proxy = self._downloader.params.get('cn_verification_proxy')
if cn_verification_proxy:
@@
-201,7
+202,7
@@
class YoukuIE(InfoExtractor):
# request basic data
basic_data_url = 'http://v.youku.com/player/getPlayList/VideoIDS/%s' % video_id
if video_password:
# request basic data
basic_data_url = 'http://v.youku.com/player/getPlayList/VideoIDS/%s' % video_id
if video_password:
- basic_data_url
= '%s?password=%s' % (basic_data_url, video_password)
+ basic_data_url
+= '?password=%s' % video_password
data1 = retrieve_data(
basic_data_url,
data1 = retrieve_data(
basic_data_url,