From a4ff6c4762fd01b606d54a2962530c753d4c52ec Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sat, 8 Mar 2014 16:04:03 +0100 Subject: [PATCH] [arte] Raise a proper error when no video is found --- youtube_dl/extractor/arte.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py index 7cf3785ac..d194f2564 100644 --- a/youtube_dl/extractor/arte.py +++ b/youtube_dl/extractor/arte.py @@ -72,18 +72,22 @@ def _real_extract(self, url): return self._extract_liveweb(url, name, lang) if re.search(self._LIVE_URL, url) is not None: - raise ExtractorError(u'Arte live streams are not yet supported, sorry') + raise ExtractorError('Arte live streams are not yet supported, sorry') # self.extractLiveStream(url) # return + raise ExtractorError('No video found') + def _extract_video(self, url, video_id, lang): """Extract from videos.arte.tv""" ref_xml_url = url.replace('/videos/', '/do_delegate/videos/') ref_xml_url = ref_xml_url.replace('.html', ',view,asPlayerXml.xml') - ref_xml_doc = self._download_xml(ref_xml_url, video_id, note=u'Downloading metadata') + ref_xml_doc = self._download_xml( + ref_xml_url, video_id, note='Downloading metadata') config_node = find_xpath_attr(ref_xml_doc, './/video', 'lang', lang) config_xml_url = config_node.attrib['ref'] - config_xml = self._download_webpage(config_xml_url, video_id, note=u'Downloading configuration') + config_xml = self._download_webpage( + config_xml_url, video_id, note='Downloading configuration') video_urls = list(re.finditer(r'(?P.*?)', config_xml)) def _key(m):