R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[blick] Use default=False argument instead of catching possible RegexNotFoundError.

Browse Source
This commit is contained in:
Alex Seiler 2016-05-25 15:45:35 +02:00
parent ea6e87e165
commit c2bec2b0d8
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
youtube_dl/extractor/blick.py
View File

@ -2,7 +2,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import RegexNotFoundError
import re import re
@ -46,23 +45,12 @@ class BlickIE(InfoExtractor):
found_videos = [] found_videos = []
regex_og = self._og_regexes('video') regex_og = self._og_regexes('video')
regex_ogs = self._og_regexes('video:secure_url') regex_ogs = self._og_regexes('video:secure_url')
try: video_og = self._html_search_regex(regex_og, webpage, name=None, default=None, fatal=False)
video_og = self._html_search_regex(regex_og, webpage, name=None) video_ogs = self._html_search_regex(regex_ogs, webpage, name=None, default=None, fatal=False)
found_videos.append(video_og) video_meta = self._html_search_meta('contentURL', webpage, fatal=False, default=None)
except RegexNotFoundError: for elem in [video_og, video_ogs, video_meta]:
pass if elem:
try: found_videos.append(elem)
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_url = '' video_url = ''
for video in found_videos: for video in found_videos: