diff options
| -rw-r--r-- | youtube_dl/downloader/f4m.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/comedycentral.py | 41 | ||||
| -rw-r--r-- | youtube_dl/extractor/spike.py | 2 |
3 files changed, 23 insertions, 22 deletions
diff --git a/youtube_dl/downloader/f4m.py b/youtube_dl/downloader/f4m.py index 13055a67e..0e7a1c200 100644 --- a/youtube_dl/downloader/f4m.py +++ b/youtube_dl/downloader/f4m.py @@ -231,7 +231,7 @@ class F4mFD(FileDownloader): """ def _get_unencrypted_media(self, doc): - media=doc.findall(_add_ns('media')) + media = doc.findall(_add_ns('media')) if not media: self.report_error('No media found') for e in (doc.findall(_add_ns('drmAdditionalHeader')) + diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py index f9256dcf4..b24538981 100644 --- a/youtube_dl/extractor/comedycentral.py +++ b/youtube_dl/extractor/comedycentral.py @@ -71,25 +71,28 @@ class ComedyCentralShowsIE(MTVServicesInfoExtractor): 'description': 'Carnegie Endowment Senior Associate Sarah Chayes discusses how corrupt institutions function throughout the world in her book "Thieves of State: Why Corruption Threatens Global Security."', 'title': 'thedailyshow Sarah Chayes Extended Interview', }, - 'playlist': [{ - 'info_dict': { - 'id': '0baad492-cbec-4ec1-9e50-ad91c291127f', - 'ext': 'mp4', - 'upload_date': '20150129', - 'description': 'Carnegie Endowment Senior Associate Sarah Chayes discusses how corrupt institutions function throughout the world in her book "Thieves of State: Why Corruption Threatens Global Security."', - 'uploader': 'thedailyshow', - 'title': 'thedailyshow sarah-chayes-extended-interview part 1', - } - }, { - 'info_dict': { - 'id': '1e4fb91b-8ce7-4277-bd7c-98c9f1bbd283', - 'ext': 'mp4', - 'upload_date': '20150129', - 'description': 'Carnegie Endowment Senior Associate Sarah Chayes discusses how corrupt institutions function throughout the world in her book "Thieves of State: Why Corruption Threatens Global Security."', - 'uploader': 'thedailyshow', - 'title': 'thedailyshow sarah-chayes-extended-interview part 2', - } - }], + 'playlist': [ + { + 'info_dict': { + 'id': '0baad492-cbec-4ec1-9e50-ad91c291127f', + 'ext': 'mp4', + 'upload_date': '20150129', + 'description': 'Carnegie Endowment Senior Associate Sarah Chayes discusses how corrupt institutions function throughout the world in her book "Thieves of State: Why Corruption Threatens Global Security."', + 'uploader': 'thedailyshow', + 'title': 'thedailyshow sarah-chayes-extended-interview part 1', + }, + }, + { + 'info_dict': { + 'id': '1e4fb91b-8ce7-4277-bd7c-98c9f1bbd283', + 'ext': 'mp4', + 'upload_date': '20150129', + 'description': 'Carnegie Endowment Senior Associate Sarah Chayes discusses how corrupt institutions function throughout the world in her book "Thieves of State: Why Corruption Threatens Global Security."', + 'uploader': 'thedailyshow', + 'title': 'thedailyshow sarah-chayes-extended-interview part 2', + }, + }, + ], 'params': { 'skip_download': True, }, diff --git a/youtube_dl/extractor/spike.py b/youtube_dl/extractor/spike.py index 1af2e9725..e529bb55c 100644 --- a/youtube_dl/extractor/spike.py +++ b/youtube_dl/extractor/spike.py @@ -1,7 +1,5 @@ from __future__ import unicode_literals -import re - from .mtv import MTVServicesInfoExtractor |