- Documentation updates.

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

diff --git a/twitter/cmdline.py b/twitter/cmdline.py
index d362b634ceb0c23bd0d8bc4d5b3aa226fa584ba1..21c26c9e7b22b558300f6c7fc049b5b4676b0fe4 100644 (file)
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -12,7 +12,7 @@ ACTIONS:
  leave          remove the specified user from your following list
  public         get latest public tweets
  replies        get latest replies
- search         searchtwitter (Beware: octothorpe, escape it)
+ search         search twitter (Beware: octothorpe, escape it)
  set            set your twitter status
  shell          login the twitter shell
 
@@ -30,7 +30,7 @@ OPTIONS:
  -t --timestamp             show time before status lines
  -d --datestamp             shoe date before status lines
     --no-ssl                use HTTP instead of more secure HTTPS
-
+    --oauth <filename>      filename to read/store oauth credentials to
 
 FORMATS for the --format option
 
@@ -52,7 +52,6 @@ prompt: <twitter_shell_prompt e.g. '[cyan]twitter[R]> '>
 
  OAuth authentication tokens are stored in the file .twitter_oauth in your
  home directory.
-
 """
 
 CONSUMER_KEY='uS6hO2sV6tDKIOeVjhnFnQ'
@@ -73,10 +72,6 @@ from api import Twitter, TwitterError
 from oauth import OAuth
 import ansi
 
-# 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 = {
     'action': 'friends',
     'refresh': False,
@@ -93,8 +88,8 @@ OPTIONS = {
 }
 
 def parse_args(args, options):
-    long_opts = ['help', 'format', 'refresh',
-                 'refresh-rate', 'config', 'length', 'timestamp', 
+    long_opts = ['help', 'format=', 'refresh', 'oauth=',
+                 'refresh-rate=', 'config=', 'length=', 'timestamp', 
                  'datestamp', 'no-ssl']
     short_opts = "e:p:f:h?rR:c:l:td"
     opts, extra_args = getopt(args, short_opts, long_opts)        
@@ -118,6 +113,8 @@ def parse_args(args, options):
             options['config_filename'] = arg
         elif opt == '--no-ssl':
             options['secure'] = False
+        elif opt == '--oauth':
+            options['oauth_filename'] = arg
 
     if extra_args and not ('action' in options and options['action'] == 'help'):
         options['action'] = extra_args[0]
@@ -460,6 +457,9 @@ paste or type it here:
     webbrowser.open(
         'http://api.twitter.com/oauth/authorize?oauth_token=' +
         oauth_token)
+    time.sleep(2) # Sometimes the last command can print some
+                  # crap. Wait a bit so it doesn't mess up the next
+                  # prompt.
     oauth_verifier = raw_input("Please type the PIN: ").strip()
     twitter = Twitter(
         auth=OAuth(
@@ -471,6 +471,7 @@ paste or type it here:
     print >> oauth_file, oauth_token
     print >> oauth_file, oauth_token_secret
     oauth_file.close()
+    print
     print "That's it! Your authorization keys have been written to %s." % (
         options['oauth_filename'])