aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/common.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-03-05 23:28:32 +0700
committerSergey M․ <dstftw@gmail.com>2017-03-05 23:29:17 +0700
commit1a2192cb904ff42a309ab2c2477fc226f8651f33 (patch)
treecc74c8c1ea39c81a737302f01a2664499b483ff0 /youtube_dl/extractor/common.py
parent0236cd0dfde1dda540c1067a9c5982d482005c47 (diff)
[extractor/common] Pass arguments to _parse_jwplayer_formats and PEP8
Diffstat (limited to 'youtube_dl/extractor/common.py')
-rw-r--r--youtube_dl/extractor/common.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 2887db0c3..78dc5be24 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -2198,7 +2198,9 @@ class InfoExtractor(object):
this_video_id = video_id or video_data['mediaid']
- formats = self._parse_jwplayer_formats(video_data['sources'], this_video_id)
+ formats = self._parse_jwplayer_formats(
+ video_data['sources'], video_id=this_video_id, m3u8_id=m3u8_id,
+ mpd_id=mpd_id, rtmp_params=rtmp_params, base_url=base_url)
self._sort_formats(formats)
subtitles = {}
@@ -2232,7 +2234,7 @@ class InfoExtractor(object):
def _parse_jwplayer_formats(self, jwplayer_sources_data, video_id=None,
m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None):
formats = []
- for source in jwplayer_sources_data :
+ for source in jwplayer_sources_data:
source_url = self._proto_relative_url(source['file'])
if base_url:
source_url = compat_urlparse.urljoin(base_url, source_url)
@@ -2285,7 +2287,6 @@ class InfoExtractor(object):
formats.append(a_format)
return formats
-
def _live_title(self, name):
""" Generate the title for a live video """
now = datetime.datetime.now()