From 71f9e49e67bfe62c9f1a6d8f74b7d81ab820ba84 Mon Sep 17 00:00:00 2001 From: George Brighton Date: Sat, 27 Jun 2015 05:22:35 +0100 Subject: [PATCH] [moviefap] Fix dictionary comprehension syntax incompatible with Python 2.6 --- youtube_dl/extractor/moviefap.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/moviefap.py b/youtube_dl/extractor/moviefap.py index 49b8ab7d9f..88f9dab6ff 100644 --- a/youtube_dl/extractor/moviefap.py +++ b/youtube_dl/extractor/moviefap.py @@ -48,17 +48,19 @@ def __get_thumbnail_data(xml): return [] # get the required information from the XML - attrs = {attr: str_to_int(timeline.find(attr).text) - for attr in ['imageWidth', 'imageHeight', 'imageFirst', 'imageLast']} + width = str_to_int(timeline.find('imageWidth').text) + height = str_to_int(timeline.find('imageHeight').text) + first = str_to_int(timeline.find('imageFirst').text) + last = str_to_int(timeline.find('imageLast').text) pattern = timeline.find('imagePattern').text # generate the list of thumbnail information dicts thumbnails = [] - for i in range(attrs['imageFirst'], attrs['imageLast'] + 1): + for i in range(first, last + 1): thumbnails.append({ 'url': pattern.replace('#', str(i)), - 'width': attrs['imageWidth'], - 'height': attrs['imageHeight'] + 'width': width, + 'height': height }) return thumbnails