adding min/max timestamp support

Mike Krieger · Mike Krieger · commit 57dc96c8264e · 2011-02-02T11:05:27.000-08:00
v2-&gt;v1
diff --git a/get_access_token.py b/get_access_token.py
@@ -1,16 +1,18 @@
 from instagram.client import InstagramAPI
-
-try:
-    from test_settings import *
-
-    InstagramAPI.host = test_host
-    InstagramAPI.base_path = test_base_path
-    InstagramAPI.access_token_field = "access_token"
-    InstagramAPI.authorize_url = test_authorize_url
-    InstagramAPI.access_token_url = test_access_token_url
-    InstagramAPI.protocol = test_protocol
-except Exception:
-    pass
+import sys
+
+if len(sys.argv) > 1 and sys.argv[1] == 'local':
+    try:
+        from test_settings import *
+
+        InstagramAPI.host = test_host
+        InstagramAPI.base_path = test_base_path
+        InstagramAPI.access_token_field = "access_token"
+        InstagramAPI.authorize_url = test_authorize_url
+        InstagramAPI.access_token_url = test_access_token_url
+        InstagramAPI.protocol = test_protocol
+    except Exception:
+        pass
 
 client_id = raw_input("Client ID: ").strip()
 client_secret = raw_input("Client Secret: ").strip()
diff --git a/instagram/bind.py b/instagram/bind.py
@@ -82,8 +82,6 @@ def _do_api_request(self, url):
             response, content = OAuth2Request(self.api).make_request(url)
             if response['status'] == '503':
                 raise InstagramAPIError(response['status'], "Rate limited", "Your client is making too many request per second")
-            elif response['status'] != '200':
-                raise InstagramAPIError(response['status'], "Server error", "The API server returned an error")
             content_obj = simplejson.loads(content)
             response_objects = []
             status_code = content_obj['meta']['code']
diff --git a/instagram/client.py b/instagram/client.py
@@ -11,7 +11,7 @@
 class InstagramAPI(oauth2.OAuth2API):
         
     host = "api-privatebeta.instagr.am"
-    base_path = "/v2"
+    base_path = "/v1"
     access_token_field = "access_token"
     authorize_url = "http://api-privatebeta.instagr.am/oauth/authorize"
     access_token_url = "http://api-privatebeta.instagr.am/oauth/access_token"
@@ -33,7 +33,7 @@ def __init__(self, *args, **kwargs):
 
     media_search = bind_method(
                 path = "/media/search",
-                accepts_parameters = SEARCH_ACCEPT_PARAMETERS + ['ll'],
+                accepts_parameters = SEARCH_ACCEPT_PARAMETERS + ['ll', 'min_timestamp', 'max_timestamp'],
                 root_class = Media)
     
     user_media_feed = bind_method(
