Merge remote-tracking branch 'michaelhelmick/relationship_status'

Author: Mike Krieger

README.md

@@ -118,6 +118,7 @@ Relationships: http://instagr.am/developer/endpoints/relationships/
     api.unblock_user(user_id)
     api.approve_user_request(user_id)
     api.ignore_user_request(user_id)
+    api.user_relationship(user_id)
 
 
 Media: http://instagr.am/developer/endpoints/media/

instagram/bind.py

@@ -1,7 +1,18 @@
 import urllib
 from oauth2 import OAuth2Request
 import re
-import simplejson
+
+try:
+    import simplejson
+except ImportError:
+    try:
+        import json as simplejson
+    except ImportError:
+        try:
+            from django.utils import simplejson
+        except ImportError:
+            raise ImportError('A json library is required to use this python library. Lol, yay for being verbose. ;)')
+
 re_path_template = re.compile('{\w+}')
 
 
@@ -91,7 +102,12 @@ def _do_api_request(self, url, method="GET", body=None, headers=None):
             response, content = OAuth2Request(self.api).make_request(url, method=method, body=body, headers=headers)
             if response['status'] == '503':
                 raise InstagramAPIError(response['status'], "Rate limited", "Your client is making too many request per second")
-            content_obj = simplejson.loads(content)
+
+            try:
+                content_obj = simplejson.loads(content)
+            except ValueError:
+                raise InstagramClientError('Unable to parse response, not valid JSON.')
+
             api_responses = []
             status_code = content_obj['meta']['code']
             if status_code == 200:

instagram/client.py

@@ -174,6 +174,15 @@ def __init__(self, *args, **kwargs):
                 requires_target_user=True,
                 response_type="entry")
 
+    user_relationship = bind_method(
+                method="GET",
+                path="/users/{user_id}/relationship",
+                root_class=Relationship,
+                accepts_parameters=["user_id"],
+                paginates=False,
+                requires_target_user=True,
+                response_type="entry")
+
     def _make_relationship_shortcut(action):
         def _inner(self, *args, **kwargs):
             return self.change_user_relationship(user_id=kwargs.get("user_id"),

instagram/models.py

@@ -154,3 +154,9 @@ def __init__(self, incoming_status="none", outgoing_status="none", target_user_i
         self.incoming_status = incoming_status
         self.outgoing_status = outgoing_status
         self.target_user_is_private = target_user_is_private
+
+    def __unicode__(self):
+        follows = False if self.outgoing_status == 'none' else True
+        followed = False if self.incoming_status == 'none' else True
+
+        return "Relationship: (Follows: %s, Followed by: %s)" % (follows, followed)

instagram/subscriptions.py

@@ -1,6 +1,16 @@
 import hmac
 import hashlib
-import simplejson
+
+try:
+    import simplejson
+except ImportError:
+    try:
+        import json as simplejson
+    except ImportError:
+        try:
+            from django.utils import simplejson
+        except ImportError:
+            raise ImportError('A json library is required to use this python library. Lol, yay for being verbose. ;)')
 
 
 class SubscriptionType:
@@ -10,7 +20,11 @@ class SubscriptionType:
     LOCATION = 'location'
 
 
-class SubscriptionVerifyError(Exception):
+class SubscriptionError(Exception):
+    pass
+
+
+class SubscriptionVerifyError(SubscriptionError):
     pass
 
 
@@ -28,7 +42,11 @@ def process(self, client_secret, raw_response, x_hub_signature):
         if not self._verify_signature(client_secret, raw_response, x_hub_signature):
             raise SubscriptionVerifyError("X-Hub-Signature and hmac digest did not match")
 
-        response = simplejson.loads(raw_response)
+        try:
+            response = simplejson.loads(raw_response)
+        except ValueError:
+            raise SubscriptionError('Unable to parse response, not valid JSON.')
+
         for update in response:
             self._process_update(update)
 

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 setup(name="python-instagram",
-      version="0.7.3",
+      version="0.8.0",
       description="Instagram API client",
       license="MIT",
       install_requires=["simplejson","httplib2"],