From db3ca36403930063b7df3b228a3f297bf278b43c Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Tue, 26 May 2015 13:37:15 +0800 Subject: [PATCH] [facebook] Move the title extraction warning below (fixes #5820) --- youtube_dl/extractor/facebook.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index 937b28fccc..e8d6827165 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -50,7 +50,10 @@ class FacebookIE(InfoExtractor): 'id': '274175099429670', 'ext': 'mp4', 'title': 'Facebook video #274175099429670', - } + }, + 'expected_warnings': [ + 'title' + ] }, { 'url': 'https://www.facebook.com/video.php?v=10204634152394104', 'only_matching': True, @@ -150,11 +153,11 @@ class FacebookIE(InfoExtractor): video_title = self._html_search_regex( r'

([^<]*)

', webpage, 'title', - fatal=False) + default=None) if not video_title: video_title = self._html_search_regex( r'(?s)(.*?)', - webpage, 'alternative title', default=None) + webpage, 'alternative title', fatal=False) video_title = limit_length(video_title, 80) if not video_title: video_title = 'Facebook video #%s' % video_id