Merge branch 'master' of github.com:beichhor/python-instagram into beichhor-master

Author: heatonjb

instagram/bind.py

@@ -99,6 +99,13 @@ def _do_api_request(self, url, method="GET", body=None, headers=None):
             except ValueError:
                 raise InstagramClientError('Unable to parse response, not valid JSON.')
 
+            # Handle OAuthRateLimitExceeded from Instagram's Nginx which uses different format to documented api responses
+            if not content_obj.has_key('meta'):
+                if content_obj.get('code') == 420:
+                    error_message = content_obj.get('error_message') or "Your client is making too many request per second"
+                    raise InstagramAPIError(420, "Rate limited", error_message)
+                raise InstagramAPIError(content_obj.has_key('code'), content_obj.has_key('error_type'), content_obj.has_key('error_message'))
+
             api_responses = []
             status_code = content_obj['meta']['code']
             self.api.x_ratelimit_remaining = response.get("x-ratelimit-remaining",None)