Merge pull request facebookarchive#109 from seajosh/master

Fix for broken tests

Author: heatonjb

instagram/bind.py

@@ -126,7 +126,7 @@ def _do_api_request(self, url, method="GET", body=None, headers=None):
             if response['status'] == '503' or response['status'] == '429':
                 raise InstagramAPIError(response['status'], "Rate limited", "Your client is making too many request per second")
             try:
-                content_obj = simplejson.loads(content.decode())
+                content_obj = simplejson.loads(content)
             except ValueError:
                 raise InstagramClientError('Unable to parse response, not valid JSON.', status_code=response['status'])
             # Handle OAuthRateLimitExceeded from Instagram's Nginx which uses different format to documented api responses

requirements.txt

@@ -3,5 +3,5 @@ httplib2==0.9
 python-instagram==1.1.3
 redis==2.10.3
 simplejson==3.6.3
-wsgiref==0.1.2
 beaker==1.6.4
+six==1.8.0