diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-07-20 23:34:20 +0200 | 
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-07-20 23:34:20 +0200 | 
| commit | 72e785f36ad215d48915b9207c403c5ce54cc9da (patch) | |
| tree | 14b47ebf3781f49aaff79fa830b1ad9b9dec2472 | |
| parent | 727d2930f25164bff9a066f78ff21643f6e70ec8 (diff) | |
[livestream] PEP8
| -rw-r--r-- | youtube_dl/extractor/livestream.py | 9 | 
1 files changed, 6 insertions, 3 deletions
| diff --git a/youtube_dl/extractor/livestream.py b/youtube_dl/extractor/livestream.py index 2c100d424..1ea1bbab4 100644 --- a/youtube_dl/extractor/livestream.py +++ b/youtube_dl/extractor/livestream.py @@ -28,11 +28,13 @@ class LivestreamIE(InfoExtractor):      }      def _extract_video_info(self, video_data): -        video_url = video_data.get('progressive_url_hd') or video_data.get('progressive_url') +        video_url = ( +            video_data.get('progressive_url_hd') or +            video_data.get('progressive_url') +        )          return {              'id': compat_str(video_data['id']),              'url': video_url, -            'ext': 'mp4',              'title': video_data['caption'],              'thumbnail': video_data['thumbnail_url'],              'upload_date': video_data['updated_at'].replace('-', '')[:8], @@ -50,7 +52,8 @@ class LivestreamIE(InfoExtractor):                  r'window.config = ({.*?});', webpage, 'window config')              info = json.loads(config_json)['event']              videos = [self._extract_video_info(video_data['data']) -                for video_data in info['feed']['data'] if video_data['type'] == 'video'] +                for video_data in info['feed']['data'] +                if video_data['type'] == 'video']              return self.playlist_result(videos, info['id'], info['full_name'])          else:              og_video = self._og_search_video_url(webpage, 'player url') | 
