Transition from httplib to urllib2.

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

diff --git a/twitter/cmdline.py b/twitter/cmdline.py
index bff33c5bee3f7b529724f346bda41e0c13cab043..061c0f2d04d1c1189367e95ff575b23c0bc1aa3e 100644 (file)
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -6,6 +6,7 @@ USAGE:
 ACTIONS:
  follow         add the specified user to your follow list
  friends        get latest tweets from your friends (default action)
 ACTIONS:
  follow         add the specified user to your follow list
  friends        get latest tweets from your friends (default action)

+ help           print this help text that you are currently reading

  leave          remove the specified user from your following list
  public         get latest public tweets
  replies        get latest replies
  leave          remove the specified user from your following list
  public         get latest public tweets
  replies        get latest replies


@@ -40,7 +41,7 @@ password: <password>
 
 import sys
 import time
 
 import sys
 import time

-from getopt import getopt
+from getopt import getopt, GetoptError

 from getpass import getpass
 import re
 import os.path
 from getpass import getpass
 import re
 import os.path


@@ -48,6 +49,10 @@ from ConfigParser import SafeConfigParser
 
 from api import Twitter, TwitterError
 
 
 from api import Twitter, TwitterError
 

+# Please don't change this, it was provided by the fine folks at Twitter.
+# If you change it, it will not work.
+AGENT_STR = "twittercommandlinetoolpy"
+

 options = {
     'email': None,
     'password': None,
 options = {
     'email': None,
     'password': None,


@@ -63,7 +68,7 @@ def parse_args(args, options):
     long_opts = ['email', 'password', 'help', 'format', 'refresh',
                  'refresh-rate', 'config']
     short_opts = "e:p:f:h?rR:c:"
     long_opts = ['email', 'password', 'help', 'format', 'refresh',
                  'refresh-rate', 'config']
     short_opts = "e:p:f:h?rR:c:"

-    opts, extra_args = getopt(args, short_opts, long_opts)
+    opts, extra_args = getopt(args, short_opts, long_opts)        

 
     for opt, arg in opts:
         if opt in ('-e', '--email'):
 
     for opt, arg in opts:
         if opt in ('-e', '--email'):


@@ -109,9 +114,9 @@ class AdminFormatter(object):
     def __call__(self, action, user):
         user_str = u"%s (%s)" %(user['screen_name'], user['name'])
         if action == "follow":
     def __call__(self, action, user):
         user_str = u"%s (%s)" %(user['screen_name'], user['name'])
         if action == "follow":

-            return u"You are now following %s" %(user_str)
+            return u"You are now following %s.\n" %(user_str)

         else:
         else:

-            return u"You are no longer following %s" %(user_str)
+            return u"You are no longer following %s.\n" %(user_str)

 
 class VerboseAdminFormatter(object):
     def __call__(self, action, user):
 
 class VerboseAdminFormatter(object):
     def __call__(self, action, user):


@@ -171,10 +176,19 @@ class StatusAction(Action):
 class AdminAction(Action):
     def __call__(self, twitter, options):
         if not options['extra_args'][0]:
 class AdminAction(Action):
     def __call__(self, twitter, options):
         if not options['extra_args'][0]:

-            raise TwitterError("You need to specify a User (Screen Name)")
+            raise TwitterError("You need to specify a user (screen name)")

         af = get_admin_formatter(options)
         af = get_admin_formatter(options)

-        user = self.getUser(twitter, options['extra_args'][0])
-        if user:
+        try:
+            user = self.getUser(twitter, options['extra_args'][0])
+        except TwitterError, e:
+            print "There was a problem following or leaving the specified user."
+            print "  You may be trying to follow a user you are already following;"
+            print "  Leaving a user you are not currently following;"
+            print "  Or the user may not exist."
+            print "  Sorry."
+            print
+            print e
+        else:

             print af(options['action'], user).encode(sys.stdout.encoding, 'replace')
 
 class FriendsAction(StatusAction):
             print af(options['action'], user).encode(sys.stdout.encoding, 'replace')
 
 class FriendsAction(StatusAction):


@@ -205,9 +219,14 @@ class SetStatusAction(Action):
         status = (statusTxt.encode('utf8', 'replace'))
         twitter.statuses.update(status=status)
 
         status = (statusTxt.encode('utf8', 'replace'))
         twitter.statuses.update(status=status)
 

+class HelpAction(Action):
+    def __call__(self, twitter, options):
+        print __doc__
+

 actions = {
     'follow': FollowAction,
     'friends': FriendsAction,
 actions = {
     'follow': FollowAction,
     'friends': FriendsAction,

+    'help': HelpAction,

     'leave': LeaveAction,
     'public': PublicAction,
     'replies': RepliesAction,
     'leave': LeaveAction,
     'public': PublicAction,
     'replies': RepliesAction,


@@ -228,21 +247,29 @@ def main():
     return main_with_args(sys.argv[1:])
 
 def main_with_args(args):
     return main_with_args(sys.argv[1:])
 
 def main_with_args(args):

-    parse_args(args, options)
+    try:
+        parse_args(args, options)
+    except GetoptError, e:
+        print >> sys.stderr, "I can't do that, %s." %(e)
+        print >> sys.stderr
+        sys.exit(1)

 
     email, password = loadConfig(options['config_filename'])
     if not options['email']: options['email'] = email
     if not options['password']: options['password'] = password
 
 
     email, password = loadConfig(options['config_filename'])
     if not options['email']: options['email'] = email
     if not options['password']: options['password'] = password
 

-    #Maybe check for AdminAction here, but whatever you do, don't write TODO
-    if options['refresh'] and options['action'] == 'set':
-        print >> sys.stderr, "You can't repeatedly set your status, silly"
+    if options['refresh'] and options['action'] not in (
+        'friends', 'public', 'replies'):
+        print >> sys.stderr, "You can only refresh the friends, public, or replies actions."

         print >> sys.stderr, "Use 'twitter -h' for help."
         sys.exit(1)
         print >> sys.stderr, "Use 'twitter -h' for help."
         sys.exit(1)

+        

     if options['email'] and not options['password']:
         options['password'] = getpass("Twitter password: ")
     if options['email'] and not options['password']:
         options['password'] = getpass("Twitter password: ")

-    twitter = Twitter(options['email'], options['password'])
+        
+    twitter = Twitter(options['email'], options['password'], agent=AGENT_STR)

     action = actions.get(options['action'], NoSuchAction)()
     action = actions.get(options['action'], NoSuchAction)()

+    

     try:
         doAction = lambda : action(twitter, options)
 
     try:
         doAction = lambda : action(twitter, options)