X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/45688301124a0a22f04d9ec032fc0423718743fc..de072195b64f3535375f1a20b25f457586a29125:/twitter/cmdline.py

diff --git a/twitter/cmdline.py b/twitter/cmdline.py
index c8506c3..061c0f2 100644
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -41,7 +41,7 @@ password: <password>
 
 import sys
 import time
-from getopt import getopt
+from getopt import getopt, GetoptError
 from getpass import getpass
 import re
 import os.path
@@ -49,7 +49,9 @@ from ConfigParser import SafeConfigParser
 
 from api import Twitter, TwitterError
 
-AGENT_STR = "Twitter Command-line Tool"
+# 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,
@@ -66,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:"
-    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'):
@@ -245,7 +247,12 @@ def main():
     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