From 7562ad9894cc68d4406dab75d5850bfd00f5331b Mon Sep 17 00:00:00 2001 From: Jorge Bastida Date: Thu, 19 Dec 2013 12:25:55 +0100 Subject: [PATCH] Fix 2.6 tests --- glue/formats/jsonformat.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/glue/formats/jsonformat.py b/glue/formats/jsonformat.py index eaec875..29179ad 100644 --- a/glue/formats/jsonformat.py +++ b/glue/formats/jsonformat.py @@ -33,19 +33,19 @@ def populate_argument_parser(cls, parser): def get_context(self, *args, **kwargs): context = super(JSONFormat, self).get_context(*args, **kwargs) - frames = {i['filename']: {'filename': i['filename'], - 'frame': {'x': i['x'], - 'y': i['y'], - 'w': i['width'], - 'h': i['height']}, - 'rotated': False, - 'trimmed': False, - 'spriteSourceSize': {'x': i['x'], - 'y': i['y'], - 'w': i['width'], - 'h': i['height']}, - 'sourceSize': {'w': i['original_width'], - 'h': i['original_height']}} for i in context['images']} + frames = dict([[i['filename'], {'filename': i['filename'], + 'frame': {'x': i['x'], + 'y': i['y'], + 'w': i['width'], + 'h': i['height']}, + 'rotated': False, + 'trimmed': False, + 'spriteSourceSize': {'x': i['x'], + 'y': i['y'], + 'w': i['width'], + 'h': i['height']}, + 'sourceSize': {'w': i['original_width'], + 'h': i['original_height']}}] for i in context['images']]) data = dict(frames=None, meta={'version': context['version'], 'hash': context['hash'],