diff options
author | Remita Amine <remitamine@gmail.com> | 2017-04-12 20:38:43 +0100 |
---|---|---|
committer | Remita Amine <remitamine@gmail.com> | 2017-04-12 20:38:43 +0100 |
commit | 40fcba5edb0f54f09e33a193a0ffefb5668ca694 (patch) | |
tree | 28f40ca64f30e71cbce96cbf069ce5121afd715c /youtube_dl/extractor | |
parent | e4d74e2778ca283330460d893a0923820a74df66 (diff) |
improve coding style
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r-- | youtube_dl/extractor/bbc.py | 4 | ||||
-rw-r--r-- | youtube_dl/extractor/common.py | 2 | ||||
-rw-r--r-- | youtube_dl/extractor/rudo.py | 2 | ||||
-rw-r--r-- | youtube_dl/extractor/viewlift.py | 2 | ||||
-rw-r--r-- | youtube_dl/extractor/vlive.py | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/youtube_dl/extractor/bbc.py b/youtube_dl/extractor/bbc.py index 0e05b782b..dd65b8d86 100644 --- a/youtube_dl/extractor/bbc.py +++ b/youtube_dl/extractor/bbc.py @@ -409,7 +409,7 @@ class BBCCoUkIE(InfoExtractor): description = smp_config['summary'] for item in smp_config['items']: kind = item['kind'] - if kind != 'programme' and kind != 'radioProgramme': + if kind not in ('programme', 'radioProgramme'): continue programme_id = item.get('vpid') duration = int_or_none(item.get('duration')) @@ -450,7 +450,7 @@ class BBCCoUkIE(InfoExtractor): for item in self._extract_items(playlist): kind = item.get('kind') - if kind != 'programme' and kind != 'radioProgramme': + if kind not in ('programme', 'radioProgramme'): continue title = playlist.find('./{%s}title' % self._EMP_PLAYLIST_NS).text description_el = playlist.find('./{%s}summary' % self._EMP_PLAYLIST_NS) diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index ae8af61de..dcc9d628a 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -1779,7 +1779,7 @@ class InfoExtractor(object): if content_type == 'text': # TODO implement WebVTT downloading pass - elif content_type == 'video' or content_type == 'audio': + elif content_type in ('video', 'audio'): base_url = '' for element in (representation, adaptation_set, period, mpd_doc): base_url_e = element.find(_add_ns('BaseURL')) diff --git a/youtube_dl/extractor/rudo.py b/youtube_dl/extractor/rudo.py index 51644011e..f036f6757 100644 --- a/youtube_dl/extractor/rudo.py +++ b/youtube_dl/extractor/rudo.py @@ -26,7 +26,7 @@ class RudoIE(InfoExtractor): } @classmethod - def _extract_url(self, webpage): + def _extract_url(cls, webpage): mobj = re.search( r'<iframe[^>]+src=(?P<q1>[\'"])(?P<url>(?:https?:)?//rudo\.video/vod/[0-9a-zA-Z]+)(?P=q1)', webpage) diff --git a/youtube_dl/extractor/viewlift.py b/youtube_dl/extractor/viewlift.py index 18735cfb2..1f29c273f 100644 --- a/youtube_dl/extractor/viewlift.py +++ b/youtube_dl/extractor/viewlift.py @@ -68,7 +68,7 @@ class ViewLiftEmbedIE(ViewLiftBaseIE): type_ = source.get('type') ext = determine_ext(file_) format_id = source.get('label') or ext - if all(v == 'm3u8' or v == 'hls' for v in (type_, ext)): + if all(v in ('m3u8', 'hls') for v in (type_, ext)): formats.extend(self._extract_m3u8_formats( file_, video_id, 'mp4', m3u8_id='hls')) else: diff --git a/youtube_dl/extractor/vlive.py b/youtube_dl/extractor/vlive.py index b9718901b..e58940607 100644 --- a/youtube_dl/extractor/vlive.py +++ b/youtube_dl/extractor/vlive.py @@ -70,9 +70,9 @@ class VLiveIE(InfoExtractor): status, long_video_id, key = params[2], params[5], params[6] status = remove_start(status, 'PRODUCT_') - if status == 'LIVE_ON_AIR' or status == 'BIG_EVENT_ON_AIR': + if status in ('LIVE_ON_AIR', 'BIG_EVENT_ON_AIR'): return self._live(video_id, webpage) - elif status == 'VOD_ON_AIR' or status == 'BIG_EVENT_INTRO': + elif status in ('VOD_ON_AIR', 'BIG_EVENT_INTRO'): if long_video_id and key: return self._replay(video_id, webpage, long_video_id, key) else: |