Merge pull request #1 from devinstevenson/pr-from-original

Deprecations update

Author: Tomoyuki Kakuda

instagram/client.py

@@ -2,7 +2,7 @@
 from .bind import bind_method
 from .models import MediaShortcode, Media, User, Location, Tag, Comment, Relationship
 
-MEDIA_ACCEPT_PARAMETERS = ["count", "max_id"]
+MEDIA_ACCEPT_PARAMETERS = ["count"]
 SEARCH_ACCEPT_PARAMETERS = ["q", "count"]
 
 SUPPORTED_FORMATS = ['json']
@@ -17,7 +17,7 @@ class InstagramAPI(oauth2.OAuth2API):
     access_token_url = "https://api.instagram.com/oauth/access_token"
     protocol = "https"
     api_name = "Instagram"
-    x_ratelimit_remaining  = None
+    x_ratelimit_remaining = None
     x_ratelimit = None
 
     def __init__(self, *args, **kwargs):
@@ -28,11 +28,6 @@ def __init__(self, *args, **kwargs):
             raise Exception("Unsupported format")
         super(InstagramAPI, self).__init__(**kwargs)
 
-    media_popular = bind_method(
-                path="/media/popular",
-                accepts_parameters=MEDIA_ACCEPT_PARAMETERS,
-                root_class=Media)
-
     media_search = bind_method(
                 path="/media/search",
                 accepts_parameters=SEARCH_ACCEPT_PARAMETERS + ['lat', 'lng', 'min_timestamp', 'max_timestamp', 'distance'],
@@ -94,20 +89,21 @@ def __init__(self, *args, **kwargs):
                 root_class=Media)
 
     user_media_feed = bind_method(
-                path="/users/self/feed",
-                accepts_parameters=MEDIA_ACCEPT_PARAMETERS,
+                path="/users/self/media/recent",
+                accepts_parameters=MEDIA_ACCEPT_PARAMETERS + ["min_id", "max_id"],
                 root_class=Media,
                 paginates=True)
 
     user_liked_media = bind_method(
                 path="/users/self/media/liked",
-                accepts_parameters=MEDIA_ACCEPT_PARAMETERS,
+                accepts_parameters=MEDIA_ACCEPT_PARAMETERS + ["max_like_id"],
                 root_class=Media,
                 paginates=True)
 
     user_recent_media = bind_method(
                 path="/users/{user_id}/media/recent",
-                accepts_parameters=MEDIA_ACCEPT_PARAMETERS + ['user_id', 'min_id', 'max_timestamp', 'min_timestamp'],
+                accepts_parameters=MEDIA_ACCEPT_PARAMETERS + ['user_id', 'min_id',
+                                                              'max_id'],
                 root_class=Media,
                 paginates=True)
 
@@ -117,14 +113,12 @@ def __init__(self, *args, **kwargs):
                 root_class=User)
 
     user_follows = bind_method(
-                path="/users/{user_id}/follows",
-                accepts_parameters=["user_id"],
+                path="/users/self/follows",
                 paginates=True,
                 root_class=User)
 
     user_followed_by = bind_method(
-                path="/users/{user_id}/followed-by",
-                accepts_parameters=["user_id"],
+                path="/users/self/followed-by",
                 paginates=True,
                 root_class=User)
 
@@ -142,7 +136,7 @@ def __init__(self, *args, **kwargs):
 
     location_search = bind_method(
                 path="/locations/search",
-                accepts_parameters=SEARCH_ACCEPT_PARAMETERS + ['lat', 'lng', 'foursquare_id', 'foursquare_v2_id'],
+                accepts_parameters=SEARCH_ACCEPT_PARAMETERS + ['lat', 'lng'],
                 root_class=Location)
 
     location = bind_method(
@@ -151,12 +145,6 @@ def __init__(self, *args, **kwargs):
                 root_class=Location,
                 response_type="entry")
 
-    geography_recent_media = bind_method(
-                path="/geographies/{geography_id}/media/recent",
-                accepts_parameters=MEDIA_ACCEPT_PARAMETERS + ["geography_id"],
-                root_class=Media,
-                paginates=True)
-
     tag_recent_media = bind_method(
                 path="/tags/{tag_name}/media/recent",
                 accepts_parameters=['count', 'max_tag_id', 'tag_name'],
@@ -216,9 +204,6 @@ def _make_subscription_action(method, include=None, exclude=None):
                               "aspect",
                               "object_id",  # Optional if subscribing to all users
                               "callback_url",
-                              "lat",  # Geography
-                              "lng",  # Geography
-                              "radius",  # Geography
                               "verify_token"]
 
         if include:

setup.py

@@ -2,13 +2,13 @@
 from setuptools import setup, find_packages
 
 setup(name="python-instagram-ext",
-      version="1.3.4",
+      version="1.3.5",
       description="Life extended Instagram API client",
       license="MIT",
-      install_requires=["simplejson","httplib2","six"],
+      install_requires=["simplejson", "httplib2", "six"],
       author="Seraphicer",
       author_email="tomoyuki.kakuda@gmail.com",
       url="http://github.com/Seraphicer/python-instagram",
-      packages = find_packages(),
-      keywords= "instagram",
-      zip_safe = True)
+      packages=find_packages(),
+      keywords="instagram",
+      zip_safe=True)

tests.py

@@ -24,7 +24,7 @@ def __init__(self, *args, **kwargs):
 
     def request(self, url, method="GET", body=None, headers={}):
         fail_state = {
-            'status':'400'
+            'status': '400'
         }, "{}"
 
         parsed = urlparse(url)
@@ -37,9 +37,9 @@ def request(self, url, method="GET", body=None, headers={}):
                 'content-location':'http://example.com/redirect/login'
             }, None
 
-        if not 'access_token' in options and not 'client_id' in options:
+        if 'access_token' not in options and 'client_id' not in options:
             fn_name += '_unauthorized'
-        if 'self' in url and not 'access_token' in options:
+        if 'self' in url and 'access_token' not in options:
             fn_name += '_no_auth_user'
 
         fl = open('fixtures/%s.json' % fn_name)
@@ -83,7 +83,7 @@ def test_xauth_exchange(self):
         username = raw_input("Enter username for XAuth (blank to skip): ").strip()
         if not username:
             return
-        password =  getpass.getpass("Enter password for XAuth (blank to skip): ").strip()
+        password = getpass.getpass("Enter password for XAuth (blank to skip): ").strip()
         access_token = self.unauthenticated_api.exchange_xauth_login_for_access_token(username, password)
         assert access_token
 
@@ -94,12 +94,9 @@ def setUp(self):
         self.client_only_api = TestInstagramAPI(client_id=client_id)
         self.api = TestInstagramAPI(access_token=access_token)
 
-    def test_media_popular(self):
-        self.api.media_popular(count=10)
-
     def test_media_search(self):
-        self.client_only_api.media_search(lat=37.7,lng=-122.22)
-        self.api.media_search(lat=37.7,lng=-122.22)
+        self.client_only_api.media_search(lat=37.7, lng=-122.22)
+        self.api.media_search(lat=37.7, lng=-122.22)
 
     def test_media_shortcode(self):
         self.client_only_api.media_shortcode('os1NQjxtvF')
@@ -144,7 +141,7 @@ def test_user_liked_media(self):
     def test_user_recent_media(self):
         media, url = self.api.user_recent_media(count=10)
 
-        self.assertTrue( all( [hasattr(obj, 'type') for obj in media] ) )
+        self.assertTrue(all([hasattr(obj, 'type') for obj in media]))
 
         image = media[0]
         self.assertEqual(
@@ -178,10 +175,6 @@ def test_user_recent_media(self):
                 video.get_thumbnail_url(),
                 "http://distilleryimage2.ak.instagram.com/11f75f1cd9cc11e2a0fd22000aa8039a_5.jpg")
 
-
-
-
-
     def test_user_search(self):
         self.api.user_search('mikeyk', 10)
 
@@ -243,8 +236,6 @@ def test_change_relationship(self):
         self.api.follow_user(user_id='10')
         self.api.unfollow_user(user_id='10')
 
-    def test_geography_recent_media(self):
-        self.api.geography_recent_media(geography_id=1)
 
 if __name__ == '__main__':
     if not TEST_AUTH: