fix method call incorrect name

Author: Rattapoom

InstagramAPI/base.py

@@ -82,17 +82,16 @@ def _setuser(self, username, password):
 
     @classmethod
     def _generatesignature(cls, data):
-        try:
-            parsedData = urllib.parse.quote(data)
-        except AttributeError:
-            # TODO: This is urllib.parse.quote in Python 3.
-            parsedData = urllib.quote(data)
+        if sys.version_info.major == 3:
+            parsed_data = urllib.parse.quote(data)
+        else:
+            parsed_data = urllib.quote(data)
 
         return (
             'ig_sig_key_version=' + cls.SIG_KEY_VERSION +
             '&signed_body=' + hmac.new(
                 cls.IG_SIG_KEY.encode('utf-8'), data.encode('utf-8'), hashlib.sha256).hexdigest() +
-            '.' + parsedData)
+            '.' + parsed_data)
 
     @staticmethod
     def _generatedeviceid(seed):
@@ -127,7 +126,7 @@ def build_body(bodies, boundary):
                 # TODO: Investigate why there is an _body here.
                 _body += u'; filename="pending_media_{uid}.{ext}"'.format(
                     uid=InstagramAPIBase.generate_upload_id(), ext=ext)
-            if _headers and type(_headers) == type([]):  # TODO: Use isinstance
+            if _headers and isinstance(_headers, list):
                 for h in _headers:
                     _body += u'\r\n{header}'.format(header=h)
             body += u'\r\n\r\n{data}\r\n'.format(data=b['data'])

InstagramAPI/endpoints.py

@@ -336,7 +336,10 @@ def get_user_followings(self, usernameId, maxid=''):
         if maxid:
             query_string['max_id'] = maxid
         # TODO: This is urllib.parse.urlencode in Python 3.
-        url += urllib.urlencode(query_string)
+        if sys.version_info.major == 3:
+            url += urllib.parse.urlencode(query_string)
+        else:
+            url += urllib.urlencode(query_string)
 
         return self._sendrequest(url)
 

InstagramAPI/instagram_api.py

@@ -29,7 +29,7 @@ def followers_iter(self, username=None, delaybetweencalls=0):
         username = username or self._loggedinuserid
 
         for item in self._iterator_template(
-                lambda maxid: self.getUserFollowers(username, maxid),
+                lambda maxid: self.get_user_followers(username, maxid),
                 field="users",
                 delaybetweencalls=delaybetweencalls):
             yield item
@@ -43,7 +43,7 @@ def followings_iter(self, username=None, delaybetweencalls=0):
         username = username or self._loggedinuserid
 
         for item in self._iterator_template(
-                lambda maxid: self.getUserFollowings(username, maxid),
+                lambda maxid: self.get_user_followings(username, maxid),
                 field="users",
                 delaybetweencalls=delaybetweencalls):
             yield item
@@ -57,7 +57,7 @@ def userfeed_iter(self, username=None, mintimestamp=None, delaybetweencalls=0):
         username = username or self._loggedinuserid
 
         for item in self._iterator_template(
-                lambda maxid: self.getUserFeed(username, maxid, mintimestamp),
+                lambda maxid: self.get_user_feed(username, maxid, mintimestamp),
                 field="items",
                 delaybetweencalls=delaybetweencalls):
             yield item
@@ -69,7 +69,7 @@ def likedmedia_iter(self, delaybetweencalls=0):
             Note: Never ends.
         """
         for item in self._iterator_template(
-                self.getLikedMedia,
+                self.get_liked_media,
                 field="items",
                 delaybetweencalls=delaybetweencalls):
             yield item