Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-11-22 09:32:51 +08:00
Code Issues Releases Wiki Activity

Do not redefine variables in list comprehensions

Browse Source
This commit is contained in:
Philipp Hagemeister 2013-07-08 02:12:20 +02:00
parent 29293c1e09
commit 20c3893f0e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/ard.py
View File

@ -32,7 +32,7 @@ class ARDIE(InfoExtractor):
# determine title and media streams from webpage # determine title and media streams from webpage
html = self._download_webpage(url, video_id) html = self._download_webpage(url, video_id)
title = re.search(self._TITLE, html).group('title') title = re.search(self._TITLE, html).group('title')
streams = [m.groupdict() for m in re.finditer(self._MEDIA_STREAM, html)] streams = [mo.groupdict() for mo in re.finditer(self._MEDIA_STREAM, html)]
if not streams: if not streams:
assert '"fsk"' in html assert '"fsk"' in html
raise ExtractorError(u'This video is only available after 8:00 pm') raise ExtractorError(u'This video is only available after 8:00 pm')

2
youtube_dl/extractor/bliptv.py
View File

@ -189,5 +189,5 @@ class BlipTVUserIE(InfoExtractor):
pagenum += 1 pagenum += 1
urls = [u'http://blip.tv/%s' % video_id for video_id in video_ids] urls = [u'http://blip.tv/%s' % video_id for video_id in video_ids]
url_entries = [self.url_result(url, 'BlipTV') for url in urls] url_entries = [self.url_result(vurl, 'BlipTV') for vurl in urls]
return [self.playlist_result(url_entries, playlist_title = username)] return [self.playlist_result(url_entries, playlist_title = username)]

6
youtube_dl/extractor/youtube.py
View File

@ -697,7 +697,7 @@ class YoutubePlaylistIE(InfoExtractor):
videos = [v[1] for v in sorted(videos)] videos = [v[1] for v in sorted(videos)]
url_results = [self.url_result(url, 'Youtube') for url in videos] url_results = [self.url_result(vurl, 'Youtube') for vurl in videos]
return [self.playlist_result(url_results, playlist_id, playlist_title)] return [self.playlist_result(url_results, playlist_id, playlist_title)]
@ -755,7 +755,7 @@ class YoutubeChannelIE(InfoExtractor):
self._downloader.to_screen(u'[youtube] Channel %s: Found %i videos' % (channel_id, len(video_ids))) self._downloader.to_screen(u'[youtube] Channel %s: Found %i videos' % (channel_id, len(video_ids)))
urls = ['http://www.youtube.com/watch?v=%s' % id for id in video_ids] urls = ['http://www.youtube.com/watch?v=%s' % id for id in video_ids]
url_entries = [self.url_result(url, 'Youtube') for url in urls] url_entries = [self.url_result(eurl, 'Youtube') for eurl in urls]
return [self.playlist_result(url_entries, channel_id)] return [self.playlist_result(url_entries, channel_id)]
@ -812,7 +812,7 @@ class YoutubeUserIE(InfoExtractor):
pagenum += 1 pagenum += 1
urls = ['http://www.youtube.com/watch?v=%s' % video_id for video_id in video_ids] urls = ['http://www.youtube.com/watch?v=%s' % video_id for video_id in video_ids]
url_results = [self.url_result(url, 'Youtube') for url in urls] url_results = [self.url_result(rurl, 'Youtube') for rurl in urls]
return [self.playlist_result(url_results, playlist_title = username)] return [self.playlist_result(url_results, playlist_title = username)]
class YoutubeSearchIE(SearchInfoExtractor): class YoutubeSearchIE(SearchInfoExtractor):