commit d0a72674c6eab914be41b637ac11627485111313
parent 1d430674c7ad8341d2025f43f93c4f582d1f92ea
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Tue, 25 Feb 2014 20:51:51 +0100
[crunchyroll] Use `enumerate`
Diffstat:
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dl/extractor/crunchyroll.py
@@ -86,9 +86,8 @@ class CrunchyrollIE(InfoExtractor):
return zlib.decompress(decrypted_data)
def _convert_subtitles_to_srt(self, subtitles):
- i = 1
output = ''
- for start, end, text in re.findall(r'<event [^>]*?start="([^"]+)" [^>]*?end="([^"]+)" [^>]*?text="([^"]+)"[^>]*?>', subtitles):
+ for i, (start, end, text) in enumerate(re.findall(r'<event [^>]*?start="([^"]+)" [^>]*?end="([^"]+)" [^>]*?text="([^"]+)"[^>]*?>', subtitles), 1):
start = start.replace('.', ',')
end = end.replace('.', ',')
text = clean_html(text)
@@ -96,7 +95,6 @@ class CrunchyrollIE(InfoExtractor):
if not text:
continue
output += '%d\n%s --> %s\n%s\n\n' % (i, start, end, text)
- i += 1
return output
def _real_extract(self,url):
@@ -187,4 +185,4 @@ class CrunchyrollIE(InfoExtractor):
'upload_date': video_upload_date,
'subtitles': subtitles,
'formats': formats,
- }-
\ No newline at end of file
+ }