aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2016-04-16 10:25:59 +0100
committerremitamine <remitamine@gmail.com>2016-04-16 10:25:59 +0100
commit0841d5013c21457932b34af6a121f26619ba5aca (patch)
tree1d869b6178134a3eb26193821778bbb002e0d944
parenta71fca8577facddf05a5a1c44691bd257047a3c3 (diff)
[cbs] do not catch Exceptions raised by by _extract_theplatform_smil
-rw-r--r--youtube_dl/extractor/cbs.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/youtube_dl/extractor/cbs.py b/youtube_dl/extractor/cbs.py
index 62f52ec8e..653d09e34 100644
--- 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)