MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-18 19:09:22 +01:00
Code Issues Releases Wiki Activity

[extractor/common] Use NO_DEFAULT from utils

Browse Source
This commit is contained in:
Sergey M․ 2015-06-28 22:56:45 +06:00
parent bf42a9906d
commit c342041fba
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/common.py
View File

@ -22,6 +22,7 @@ from ..compat import (
compat_str, compat_str,
) )
from ..utils import ( from ..utils import (
NO_DEFAULT,
age_restricted, age_restricted,
bug_reports_message, bug_reports_message,
clean_html, clean_html,
@ -33,7 +34,7 @@ from ..utils import (
sanitize_filename, sanitize_filename,
unescapeHTML, unescapeHTML,
) )
_NO_DEFAULT = object()
class InfoExtractor(object): class InfoExtractor(object):
@ -523,7 +524,7 @@ class InfoExtractor(object):
video_info['description'] = playlist_description video_info['description'] = playlist_description
return video_info return video_info
def _search_regex(self, pattern, string, name, default=_NO_DEFAULT, fatal=True, flags=0, group=None): def _search_regex(self, pattern, string, name, default=NO_DEFAULT, fatal=True, flags=0, group=None):
""" """
Perform a regex search on the given string, using a single or a list of Perform a regex search on the given string, using a single or a list of
patterns returning the first matching group. patterns returning the first matching group.
@ -549,7 +550,7 @@ class InfoExtractor(object):
return next(g for g in mobj.groups() if g is not None) return next(g for g in mobj.groups() if g is not None)
else: else:
return mobj.group(group) return mobj.group(group)
elif default is not _NO_DEFAULT: elif default is not NO_DEFAULT:
return default return default
elif fatal: elif fatal:
raise RegexNotFoundError('Unable to extract %s' % _name) raise RegexNotFoundError('Unable to extract %s' % _name)
@ -557,7 +558,7 @@ class InfoExtractor(object):
self._downloader.report_warning('unable to extract %s' % _name + bug_reports_message()) self._downloader.report_warning('unable to extract %s' % _name + bug_reports_message())
return None return None
def _html_search_regex(self, pattern, string, name, default=_NO_DEFAULT, fatal=True, flags=0, group=None): def _html_search_regex(self, pattern, string, name, default=NO_DEFAULT, fatal=True, flags=0, group=None):
""" """
Like _search_regex, but strips HTML tags and unescapes entities. Like _search_regex, but strips HTML tags and unescapes entities.
""" """