Fix routing to rate_limit_status calls (Fix #157)

[z_archive/twitter.git] / twitter / follow.py

diff --git a/twitter/follow.py b/twitter/follow.py
index 335b7a0740558df166a99728638a0847a7dfa394..fda7bbc821c5d2b1e50cd7f4bb2e9b4a79e0795b 100644 (file)
--- a/twitter/follow.py
+++ b/twitter/follow.py
@@ -9,6 +9,7 @@ OPTIONS
  -r --followers        display followers of the given user (default)
  -g --following        display users the given user is following
  -a --api-rate         see your current API rate limit status
+ -i --ids              prepend user id to each line. useful to tracking renames
 
 AUTHENTICATION
     Authenticate to Twitter using OAuth to see following/followers of private
@@ -41,8 +42,8 @@ from .util import Fail, err
 
 def parse_args(args, options):
     """Parse arguments from command-line to set options."""
-    long_opts = ['help', 'oauth', 'followers', 'following', 'api-rate']
-    short_opts = "horga"
+    long_opts = ['help', 'oauth', 'followers', 'following', 'api-rate', 'ids']
+    short_opts = "horgai"
     opts, extra_args = getopt(args, short_opts, long_opts)
 
     for opt, arg in opts:
@@ -57,6 +58,8 @@ def parse_args(args, options):
             options['followers'] = False
         elif opt in ('-a', '--api-rate'):
             options['api-rate' ] = True
+        elif opt in ('-i', '--ids'):
+            options['show_id'] = True
 
     options['extra_args'] = extra_args
 
@@ -80,7 +83,7 @@ def lookup(twitter, user_ids):
             except TwitterError as e:
                 if e.e.code == 400:
                     err("Fail: %i API rate limit exceeded" % e.e.code)
-                    rate = twitter.account.rate_limit_status()
+                    rate = twitter.application.rate_limit_status()
                     reset = rate['reset_time_in_seconds']
                     reset = time.asctime(time.localtime(reset))
                     delay = int(rate['reset_time_in_seconds']
@@ -138,7 +141,7 @@ def follow(twitter, screen_name, followers=True):
                 break
             elif e.e.code == 400:
                 err("Fail: %i API rate limit exceeded" % e.e.code)
-                rate = twitter.account.rate_limit_status()
+                rate = twitter.application.rate_limit_status()
                 reset = rate['reset_time_in_seconds']
                 reset = time.asctime(time.localtime(reset))
                 delay = int(rate['reset_time_in_seconds']
@@ -177,7 +180,7 @@ def follow(twitter, screen_name, followers=True):
 
 def rate_limit_status(twitter):
     """Print current Twitter API rate limit status."""
-    r = twitter.account.rate_limit_status()
+    r = twitter.application.rate_limit_status()
     print("Remaining API requests: %i/%i (hourly limit)"
           % (r['remaining_hits'], r['hourly_limit']))
     print("Next reset in %is (%s)"
@@ -188,7 +191,8 @@ def main(args=sys.argv[1:]):
     options = {
         'oauth': False,
         'followers': True,
-        'api-rate': False
+        'api-rate': False,
+        'show_id': False
     }
     try:
         parse_args(args, options)
@@ -214,7 +218,7 @@ def main(args=sys.argv[1:]):
     else:
         auth = NoAuth()
 
-    twitter = Twitter(auth=auth, api_version='1', domain='api.twitter.com')
+    twitter = Twitter(auth=auth, api_version='1.1', domain='api.twitter.com')
 
     if options['api-rate']:
         rate_limit_status(twitter)
@@ -232,7 +236,17 @@ def main(args=sys.argv[1:]):
             raise SystemExit(1)
 
         for uid in user_ids:
-            print(users[uid].encode("utf-8"))
+            if options['show_id']:
+              try:
+                print(str(uid) + "\t" + users[uid].encode("utf-8"))
+              except KeyError:
+                pass
+
+            else:
+              try:
+                print(users[uid].encode("utf-8"))
+              except KeyError:
+                pass
 
         # print total on stderr to separate from user list on stdout
         if options['followers']: