Init Image using object_from_dictionary for

shayne · shayne · commit 68fa152fc200 · 2011-02-23T17:59:38.000-08:00
Python 2.5 support.
diff --git a/instagram/models.py b/instagram/models.py
@@ -9,7 +9,7 @@ def object_from_dictionary(cls, entry):
         return cls(**entry_str_dict)
 
 class Image(ApiModel):
-    
+
     def __init__(self, url, width, height):
         self.url = url
         self.height = height
@@ -21,23 +21,23 @@ def __init__(self, id=None, **kwargs):
         self.id = id
         for key,value in kwargs.iteritems():
             setattr(self, key, value)
-    
+
     def get_standard_resolution_url(self):
         return self.images['standard_resolution'].url
-    
+
     @classmethod
     def object_from_dictionary(cls, entry):
         new_media = Media(id=entry['id'])
-        
+
         new_media.user = User.object_from_dictionary(entry['user'])
         new_media.images = {}
         for version,version_info in entry['images'].iteritems():
-            new_media.images[version] = Image(**version_info)
+            new_media.images[version] = Image.object_from_dictionary(version_info)
 
         if 'user_has_liked' in entry:
             new_media.user_has_liked = entry['user_has_liked']
         new_media.like_count = entry['likes']['count']
-        
+
         new_media.comment_count = entry['comments']['count']
         new_media.comments = []
         for comment in entry['comments']['data']:
@@ -57,7 +57,7 @@ def __init__(self, name, **kwargs):
         self.name = name
         for key,value in kwargs.iteritems():
             setattr(self, key, value)
-        
+
     def __str__(self):
         return "Tag %s" % self.name
 
@@ -98,7 +98,7 @@ def object_from_dictionary(cls, entry):
                        point,
                        name=entry['name'])
         return location
-         
+
 class User(ApiModel):
 
     def __init__(self, id, *args, **kwargs):
@@ -114,5 +114,5 @@ class Relationship(ApiModel):
     def __init__(self, incoming_status="none", outgoing_status="none"):
         self.incoming_status = incoming_status
         self.outgoing_status = outgoing_status
-        
+
 
