depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-26 04:02:11 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Yen Chi Hsuan 2015-05-14 17:07:02 +08:00
commit 88f9d8748c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
youtube_dl/extractor/canalplus.py
View file

@ -25,14 +25,14 @@ class CanalplusIE(InfoExtractor):
} }
_TESTS = [{ _TESTS = [{
'url': 'http://www.canalplus.fr/c-infos-documentaires/pid1830-c-zapping.html?vid=922470', 'url': 'http://www.canalplus.fr/c-emissions/pid1830-c-zapping.html?vid=1263092',
'md5': '3db39fb48b9685438ecf33a1078023e4', 'md5': 'b3481d7ca972f61e37420798d0a9d934',
'info_dict': { 'info_dict': {
'id': '922470', 'id': '1263092',
'ext': 'flv', 'ext': 'flv',
'title': 'Zapping - 26/08/13', 'title': 'Le Zapping - 13/05/15',
'description': 'Le meilleur de toutes les chaînes, tous les jours.\nEmission du 26 août 2013', 'description': 'md5:09738c0d06be4b5d06a0940edb0da73f',
'upload_date': '20130826', 'upload_date': '20150513',
}, },
}, { }, {
'url': 'http://www.piwiplus.fr/videos-piwi/pid1405-le-labyrinthe-boing-super-ranger.html?vid=1108190', 'url': 'http://www.piwiplus.fr/videos-piwi/pid1405-le-labyrinthe-boing-super-ranger.html?vid=1108190',
@ -56,7 +56,7 @@ class CanalplusIE(InfoExtractor):
'skip': 'videos get deleted after a while', 'skip': 'videos get deleted after a while',
}, { }, {
'url': 'http://www.itele.fr/france/video/aubervilliers-un-lycee-en-colere-111559', 'url': 'http://www.itele.fr/france/video/aubervilliers-un-lycee-en-colere-111559',
'md5': '65aa83ad62fe107ce29e564bb8712580', 'md5': 'f3a46edcdf28006598ffaf5b30e6a2d4',
'info_dict': { 'info_dict': {
'id': '1213714', 'id': '1213714',
'ext': 'flv', 'ext': 'flv',