commit 0841d5013c21457932b34af6a121f26619ba5aca
parent a71fca8577facddf05a5a1c44691bd257047a3c3
Author: remitamine <remitamine@gmail.com>
Date: Sat, 16 Apr 2016 10:25:59 +0100
[cbs] do not catch Exceptions raised by by _extract_theplatform_smil
Diffstat:
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/youtube_dl/extractor/cbs.py b/youtube_dl/extractor/cbs.py
@@ -84,14 +84,11 @@ class CBSIE(CBSBaseIE):
pid = xpath_text(item, 'pid')
if not pid:
continue
- try:
- tp_release_url = self.TP_RELEASE_URL_TEMPLATE % pid
- if '.m3u8' in xpath_text(item, 'contentUrl', default=''):
- tp_release_url += '&manifest=m3u'
- tp_formats, tp_subtitles = self._extract_theplatform_smil(
- tp_release_url, content_id, 'Downloading %s SMIL data' % pid)
- except ExtractorError:
- continue
+ tp_release_url = self.TP_RELEASE_URL_TEMPLATE % pid
+ if '.m3u8' in xpath_text(item, 'contentUrl', default=''):
+ tp_release_url += '&manifest=m3u'
+ tp_formats, tp_subtitles = self._extract_theplatform_smil(
+ tp_release_url, content_id, 'Downloading %s SMIL data' % pid)
formats.extend(tp_formats)
subtitles = self._merge_subtitles(subtitles, tp_subtitles)
self._sort_formats(formats)