From: Sergey M․ Date: Sat, 31 Oct 2015 18:01:34 +0000 (+0600) Subject: [extractor/common] Fix m3u8 extraction on failure X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=dbd82a1d4fff1655920e111cc25a7fd526d7bf9a;p=youtube-dl [extractor/common] Fix m3u8 extraction on failure --- diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 59c3fa8dc..1f09fbb47 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -943,13 +943,14 @@ class InfoExtractor(object): if re.match(r'^https?://', u) else compat_urlparse.urljoin(m3u8_url, u)) - m3u8_doc, urlh = self._download_webpage_handle( + res = self._download_webpage_handle( m3u8_url, video_id, note=note or 'Downloading m3u8 information', errnote=errnote or 'Failed to download m3u8 information', fatal=fatal) - if m3u8_doc is False: - return m3u8_doc + if res is False: + return res + m3u8_doc, urlh = res m3u8_url = urlh.geturl() last_info = None last_media = None