From c2bec2b0d80e2a47f06417eff9f2a6dfcf8e13ea Mon Sep 17 00:00:00 2001 From: Alex Seiler Date: Wed, 25 May 2016 15:45:35 +0200 Subject: [PATCH] [blick] Use default=False argument instead of catching possible RegexNotFoundError. --- youtube_dl/extractor/blick.py | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/youtube_dl/extractor/blick.py b/youtube_dl/extractor/blick.py index c5a1a8442..5f9837cfe 100644 --- a/youtube_dl/extractor/blick.py +++ b/youtube_dl/extractor/blick.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import RegexNotFoundError import re @@ -46,23 +45,12 @@ class BlickIE(InfoExtractor): found_videos = [] regex_og = self._og_regexes('video') regex_ogs = self._og_regexes('video:secure_url') - try: - video_og = self._html_search_regex(regex_og, webpage, name=None) - found_videos.append(video_og) - except RegexNotFoundError: - pass - try: - video_ogs = self._html_search_regex(regex_ogs, webpage, name=None) - if video_ogs not in found_videos: - found_videos.append(video_ogs) - except RegexNotFoundError: - pass - try: - video_meta = self._html_search_meta('contentURL', webpage) - if video_meta not in found_videos: - found_videos.append(video_meta) - except RegexNotFoundError: - pass + video_og = self._html_search_regex(regex_og, webpage, name=None, default=None, fatal=False) + video_ogs = self._html_search_regex(regex_ogs, webpage, name=None, default=None, fatal=False) + video_meta = self._html_search_meta('contentURL', webpage, fatal=False, default=None) + for elem in [video_og, video_ogs, video_meta]: + if elem: + found_videos.append(elem) video_url = '' for video in found_videos: