projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Letv] Fix test_Letv and test_Letv_1 failures in python 3
[youtube-dl]
/
youtube_dl
/
extractor
/
letv.py
diff --git
a/youtube_dl/extractor/letv.py
b/youtube_dl/extractor/letv.py
index fd5fd260e9e40baf294815d9b42c363d0f482380..9ed81a1992acc8e527844e0242e6392abe37884f 100644
(file)
--- a/
youtube_dl/extractor/letv.py
+++ b/
youtube_dl/extractor/letv.py
@@
-40,9
+40,6
@@
class LetvIE(InfoExtractor):
'title': '美人天下01',
'description': 'md5:f88573d9d7225ada1359eaf0dbf8bcda',
},
'title': '美人天下01',
'description': 'md5:f88573d9d7225ada1359eaf0dbf8bcda',
},
- 'expected_warnings': [
- 'publish time'
- ]
}, {
'note': 'This video is available only in Mainland China, thus a proxy is needed',
'url': 'http://www.letv.com/ptv/vplay/1118082.html',
}, {
'note': 'This video is available only in Mainland China, thus a proxy is needed',
'url': 'http://www.letv.com/ptv/vplay/1118082.html',
@@
-53,11
+50,8
@@
class LetvIE(InfoExtractor):
'title': '与龙共舞 完整版',
'description': 'md5:7506a5eeb1722bb9d4068f85024e3986',
},
'title': '与龙共舞 完整版',
'description': 'md5:7506a5eeb1722bb9d4068f85024e3986',
},
- 'expected_warnings': [
- 'publish time'
- ],
'params': {
'params': {
- 'cn_verification_proxy': 'proxy.uku.im:8888'
+ 'cn_verification_proxy': '
http://
proxy.uku.im:8888'
},
}]
},
}]
@@
-94,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 = 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')
play_json = self._download_json(
play_json_req,
media_id, 'playJson data')