From d0a72674c6eab914be41b637ac11627485111313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Tue, 25 Feb 2014 20:51:51 +0100 Subject: [PATCH] [crunchyroll] Use `enumerate` --- youtube_dl/extractor/crunchyroll.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dl/extractor/crunchyroll.py index 5587ade12..026a9177e 100644 --- a/youtube_dl/extractor/crunchyroll.py +++ b/youtube_dl/extractor/crunchyroll.py @@ -86,9 +86,8 @@ def next_value(self): return zlib.decompress(decrypted_data) def _convert_subtitles_to_srt(self, subtitles): - i = 1 output = '' - for start, end, text in re.findall(r']*?start="([^"]+)" [^>]*?end="([^"]+)" [^>]*?text="([^"]+)"[^>]*?>', subtitles): + for i, (start, end, text) in enumerate(re.findall(r']*?start="([^"]+)" [^>]*?end="([^"]+)" [^>]*?text="([^"]+)"[^>]*?>', subtitles), 1): start = start.replace('.', ',') end = end.replace('.', ',') text = clean_html(text) @@ -96,7 +95,6 @@ def _convert_subtitles_to_srt(self, subtitles): 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 @@ def _real_extract(self,url): 'upload_date': video_upload_date, 'subtitles': subtitles, 'formats': formats, - } \ No newline at end of file + }