Merge pull request #1 from wkoot/safe_comments_data

Safely fetch comment data

Author: wkoot

fixtures/media_search.json

@@ -594,6 +594,60 @@
                 "profile_picture": "http://distillery.s3.amazonaws.com/profiles/profile_113603_75sq_1287035206.jpg",
                 "id": "113603"
             }
+        },
+        {
+            "type": "image",
+            "tags": [],
+            "location": {
+                "latitude": 37.775180799999987,
+                "id": "68841",
+                "longitude": -122.2270716,
+                "name": "El Novillo Taco Truck"
+            },
+            "comments": {
+                "count": 1
+            },
+            "caption": {
+                "created_time": "1287585453",
+                "text": "Image with broken comment data ",
+                "from": {
+                    "username": "darodriguez",
+                    "first_name": "David",
+                    "last_name": "Rodriguez",
+                    "type": "user",
+                    "id": "113603"
+                },
+                "id": "495311"
+            },
+            "link": "http://localhost:8000/p/C5Wr/",
+            "likes": {
+                "count": 0
+            },
+            "created_time": "1287585407",
+            "images": {
+                "low_resolution": {
+                    "url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/20/1fde15405b6349ef949c9a8f5498868e_6.jpg",
+                    "width": 480,
+                    "height": 480
+                },
+                "thumbnail": {
+                    "url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/20/1fde15405b6349ef949c9a8f5498868e_5.jpg",
+                    "width": 150,
+                    "height": 150
+                },
+                "standard_resolution": {
+                    "url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/20/1fde15405b6349ef949c9a8f5498868e_7.jpg",
+                    "width": 612,
+                    "height": 612
+                }
+            },
+            "user_has_liked": false,
+            "id": "759211",
+            "user": {
+                "username": "darodriguez",
+                "profile_picture": "http://distillery.s3.amazonaws.com/profiles/profile_113603_75sq_1287035206.jpg",
+                "id": "113603"
+            }
         }
     ]
 }

instagram/models.py

@@ -94,10 +94,12 @@ def object_from_dictionary(cls, entry):
             for like in entry['likes']['data']:
                 new_media.likes.append(User.object_from_dictionary(like))
 
-        new_media.comment_count = entry['comments']['count']
-        new_media.comments = []
-        for comment in entry['comments']['data']:
-            new_media.comments.append(Comment.object_from_dictionary(comment))
+        new_media.comment_count = entry.get('comments', {}).get('count', 0)
+        if new_media.comment_count:
+            new_media.comments = []
+            if entry.get('comments', {}).get('data'):
+                for comment in entry['comments']['data']:
+                    new_media.comments.append(Comment.object_from_dictionary(comment))
 
         new_media.users_in_photo = []
         if entry.get('users_in_photo'):