Trivial typo fixes

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

diff --git a/twitter/cmdline.py b/twitter/cmdline.py
index b2ed3b4c391f84912d7552dcd827797320400cc9..31cfee57f63d87b5168f6116f512d077111f08b5 100644 (file)
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -1,3 +1,4 @@
+# encoding: utf-8

 """
 USAGE:
 
 """
 USAGE:
 


@@ -6,15 +7,21 @@ USAGE:
 
 ACTIONS:
  authorize      authorize the command-line tool to interact with Twitter
 
 ACTIONS:
  authorize      authorize the command-line tool to interact with Twitter

- follow         add the specified user to your follow list
+ follow         follow a user

  friends        get latest tweets from your friends (default action)
  help           print this help text that you are currently reading
  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          stop following a user
+ list           get list of a user's lists; give a list name to get
+                    tweets from that list
+ mylist         get list of your lists; give a list name to get tweets
+                    from that list
+ pyprompt       start a Python prompt for interacting with the twitter
+                    object directly
+ replies        get latest replies to you

  search         search twitter (Beware: octothorpe, escape it)
  set            set your twitter status
  search         search twitter (Beware: octothorpe, escape it)
  set            set your twitter status

- shell          login the twitter shell
+ shell          login to the twitter shell
+ rate           get your current rate limit status (remaining API reqs)

 
 
 OPTIONS:
 
 
 OPTIONS:


@@ -28,14 +35,15 @@ OPTIONS:
  -l --length <count>        specify number of status updates shown
                             (default: 20, max: 200)
  -t --timestamp             show time before status lines
  -l --length <count>        specify number of status updates shown
                             (default: 20, max: 200)
  -t --timestamp             show time before status lines

- -d --datestamp             shoe date before status lines
-    --no-ssl                use HTTP instead of more secure HTTPS
+ -d --datestamp             show date before status lines
+    --no-ssl                use less-secure HTTP instead of HTTPS

     --oauth <filename>      filename to read/store oauth credentials to
 
 FORMATS for the --format option
 
  default         one line per status
  verbose         multiple lines per status, more verbose status info
     --oauth <filename>      filename to read/store oauth credentials to
 
 FORMATS for the --format option
 
  default         one line per status
  verbose         multiple lines per status, more verbose status info

+ json            raw json data from the api on each line

  urls            nothing but URLs
  ansi            ansi colour (rainbow mode)
 
  urls            nothing but URLs
  ansi            ansi colour (rainbow mode)
 


@@ -54,24 +62,48 @@ prompt: <twitter_shell_prompt e.g. '[cyan]twitter[R]> '>
  home directory.
 """
 
  home directory.
 """
 

-CONSUMER_KEY='uS6hO2sV6tDKIOeVjhnFnQ'
-CONSUMER_SECRET='MEYTOS97VvlHX7K1rwHPEqVpTSqZ71HtvoK4sVuYk'
+from __future__ import print_function
+
+try:
+    input = __builtins__['raw_input']
+except (AttributeError, KeyError):
+    pass
+
+
+CONSUMER_KEY = 'uS6hO2sV6tDKIOeVjhnFnQ'
+CONSUMER_SECRET = 'MEYTOS97VvlHX7K1rwHPEqVpTSqZ71HtvoK4sVuYk'

 
 

-import sys
-import time

 from getopt import gnu_getopt as getopt, GetoptError
 from getpass import getpass
 from getopt import gnu_getopt as getopt, GetoptError
 from getpass import getpass

-import re
+import json
+import locale

 import os.path
 import os.path

-from ConfigParser import SafeConfigParser
+import re
+import string
+import sys
+import time
+
+try:
+    from ConfigParser import SafeConfigParser
+except ImportError:
+    from configparser import ConfigParser as SafeConfigParser

 import datetime
 import datetime

-from urllib import quote
+try:
+    from urllib.parse import quote
+except ImportError:
+    from urllib2 import quote
+try:
+    import HTMLParser
+except ImportError:
+    import html.parser as HTMLParser
+

 import webbrowser
 
 import webbrowser
 

-from api import Twitter, TwitterError
-from oauth import OAuth, write_token_file, read_token_file
-from oauth_dance import oauth_dance
-import ansi
+from .api import Twitter, TwitterError
+from .oauth import OAuth, write_token_file, read_token_file
+from .oauth_dance import oauth_dance
+from . import ansi
+from .util import smrt_input, printNicely

 
 OPTIONS = {
     'action': 'friends',
 
 OPTIONS = {
     'action': 'friends',


@@ -79,21 +111,31 @@ OPTIONS = {
     'refresh_rate': 600,
     'format': 'default',
     'prompt': '[cyan]twitter[R]> ',
     'refresh_rate': 600,
     'format': 'default',
     'prompt': '[cyan]twitter[R]> ',

-    'config_filename': os.environ.get('HOME', '') + os.sep + '.twitter',
-    'oauth_filename': os.environ.get('HOME', '') + os.sep + '.twitter_oauth',
+    'config_filename': os.environ.get('HOME', os.environ.get('USERPROFILE', '')) + os.sep + '.twitter',
+    'oauth_filename': os.environ.get('HOME', os.environ.get('USERPROFILE', '')) + os.sep + '.twitter_oauth',

     'length': 20,
     'timestamp': False,
     'datestamp': False,
     'extra_args': [],
     'secure': True,
     'length': 20,
     'timestamp': False,
     'datestamp': False,
     'extra_args': [],
     'secure': True,

+    'invert_split': False,
+    'force-ansi': False,

 }
 
 }
 

+gHtmlParser = HTMLParser.HTMLParser()
+hashtagRe = re.compile(r'(?P<hashtag>#\S+)')
+profileRe = re.compile(r'(?P<profile>\@\S+)')
+ansiFormatter = ansi.AnsiCmd(False)
+

 def parse_args(args, options):
     long_opts = ['help', 'format=', 'refresh', 'oauth=',
                  'refresh-rate=', 'config=', 'length=', 'timestamp',
 def parse_args(args, options):
     long_opts = ['help', 'format=', 'refresh', 'oauth=',
                  'refresh-rate=', 'config=', 'length=', 'timestamp',

-                 'datestamp', 'no-ssl']
+                 'datestamp', 'no-ssl', 'force-ansi']

     short_opts = "e:p:f:h?rR:c:l:td"
     opts, extra_args = getopt(args, short_opts, long_opts)
     short_opts = "e:p:f:h?rR:c:l:td"
     opts, extra_args = getopt(args, short_opts, long_opts)

+    if extra_args and hasattr(extra_args[0], 'decode'):
+        extra_args = [arg.decode(locale.getpreferredencoding())
+                      for arg in extra_args]

 
     for opt, arg in opts:
         if opt in ('-f', '--format'):
 
     for opt, arg in opts:
         if opt in ('-f', '--format'):


@@ -116,6 +158,8 @@ def parse_args(args, options):
             options['secure'] = False
         elif opt == '--oauth':
             options['oauth_filename'] = arg
             options['secure'] = False
         elif opt == '--oauth':
             options['oauth_filename'] = arg

+        elif opt == '--force-ansi':
+            options['force-ansi'] = True

 
     if extra_args and not ('action' in options and options['action'] == 'help'):
         options['action'] = extra_args[0]
 
     if extra_args and not ('action' in options and options['action'] == 'help'):
         options['action'] = extra_args[0]


@@ -139,11 +183,33 @@ def get_time_string(status, options, format="%a %b %d %H:%M:%S +0000 %Y"):
         return time.strftime("%Y-%m-%d ", t)
     return ""
 
         return time.strftime("%Y-%m-%d ", t)
     return ""
 

+def reRepl(m):
+    ansiTypes = {
+          'clear':   ansiFormatter.cmdReset(),
+          'hashtag': ansiFormatter.cmdBold(),
+          'profile': ansiFormatter.cmdUnderline(),
+          }
+
+    s = None
+    try:
+        mkey = m.lastgroup
+        if m.group(mkey):
+            s = '%s%s%s' % (ansiTypes[mkey], m.group(mkey), ansiTypes['clear'])
+    except IndexError:
+        pass
+    return s
+
+def replaceInStatus(status):
+    txt = gHtmlParser.unescape(status)
+    txt = re.sub(hashtagRe, reRepl, txt)
+    txt = re.sub(profileRe, reRepl, txt)
+    return txt
+

 class StatusFormatter(object):
     def __call__(self, status, options):
 class StatusFormatter(object):
     def __call__(self, status, options):

-        return (u"%s%s %s" %(
+        return ("%s%s %s" % (

             get_time_string(status, options),
             get_time_string(status, options),

-            status['user']['screen_name'], status['text']))
+            status['user']['screen_name'], gHtmlParser.unescape(status['text'])))

 
 class AnsiStatusFormatter(object):
     def __init__(self):
 
 class AnsiStatusFormatter(object):
     def __init__(self):


@@ -151,36 +217,66 @@ class AnsiStatusFormatter(object):
 
     def __call__(self, status, options):
         colour = self._colourMap.colourFor(status['user']['screen_name'])
 
     def __call__(self, status, options):
         colour = self._colourMap.colourFor(status['user']['screen_name'])

-        return (u"%s%s%s%s %s" %(
+        return ("%s%s%s%s %s" % (

             get_time_string(status, options),
             get_time_string(status, options),

-            ansi.cmdColour(colour), status['user']['screen_name'],
-            ansi.cmdReset(), status['text']))
+            ansiFormatter.cmdColour(colour), status['user']['screen_name'],
+            ansiFormatter.cmdReset(), replaceInStatus(status['text'])))

 
 class VerboseStatusFormatter(object):
     def __call__(self, status, options):
 
 class VerboseStatusFormatter(object):
     def __call__(self, status, options):

-        return (u"-- %s (%s) on %s\n%s\n" %(
+        return ("-- %s (%s) on %s\n%s\n" % (

             status['user']['screen_name'],
             status['user']['location'],
             status['created_at'],
             status['user']['screen_name'],
             status['user']['location'],
             status['created_at'],

-            status['text']))
+            gHtmlParser.unescape(status['text'])))
+
+class JSONStatusFormatter(object):
+    def __call__(self, status, options):
+         status['text'] = gHtmlParser.unescape(status['text'])
+         return json.dumps(status)

 
 class URLStatusFormatter(object):
     urlmatch = re.compile(r'https?://\S+')
     def __call__(self, status, options):
         urls = self.urlmatch.findall(status['text'])
 
 class URLStatusFormatter(object):
     urlmatch = re.compile(r'https?://\S+')
     def __call__(self, status, options):
         urls = self.urlmatch.findall(status['text'])

-        return u'\n'.join(urls) if urls else ""
+        return '\n'.join(urls) if urls else ""
+
+
+class ListsFormatter(object):
+    def __call__(self, list):
+        if list['description']:
+            list_str = "%-30s (%s)" % (list['name'], list['description'])
+        else:
+            list_str = "%-30s" % (list['name'])
+        return "%s\n" % list_str
+
+class ListsVerboseFormatter(object):
+    def __call__(self, list):
+        list_str = "%-30s\n description: %s\n members: %s\n mode:%s\n" % (list['name'], list['description'], list['member_count'], list['mode'])
+        return list_str
+
+class AnsiListsFormatter(object):
+    def __init__(self):
+        self._colourMap = ansi.ColourMap()
+
+    def __call__(self, list):
+        colour = self._colourMap.colourFor(list['name'])
+        return ("%s%-15s%s %s" % (
+            ansiFormatter.cmdColour(colour), list['name'],
+            ansiFormatter.cmdReset(), list['description']))
+

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

-        user_str = u"%s (%s)" %(user['screen_name'], user['name'])
+        user_str = "%s (%s)" % (user['screen_name'], user['name'])

         if action == "follow":
         if action == "follow":

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

         else:
         else:

-            return u"You are no longer following %s.\n" %(user_str)
+            return "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):

-        return(u"-- %s: %s (%s): %s" % (
+        return("-- %s: %s (%s): %s" % (

             "Following" if action == "follow" else "Leaving",
             user['screen_name'],
             user['name'],
             "Following" if action == "follow" else "Leaving",
             user['screen_name'],
             user['name'],


@@ -188,18 +284,18 @@ class VerboseAdminFormatter(object):
 
 class SearchFormatter(object):
     def __call__(self, result, options):
 
 class SearchFormatter(object):
     def __call__(self, result, options):

-        return(u"%s%s %s" %(
+        return("%s%s %s" % (

             get_time_string(result, options, "%a, %d %b %Y %H:%M:%S +0000"),
             result['from_user'], result['text']))
 
 class VerboseSearchFormatter(SearchFormatter):
             get_time_string(result, options, "%a, %d %b %Y %H:%M:%S +0000"),
             result['from_user'], result['text']))
 
 class VerboseSearchFormatter(SearchFormatter):

-    pass #Default to the regular one
+    pass  # Default to the regular one

 
 class URLSearchFormatter(object):
     urlmatch = re.compile(r'https?://\S+')
     def __call__(self, result, options):
         urls = self.urlmatch.findall(result['text'])
 
 class URLSearchFormatter(object):
     urlmatch = re.compile(r'https?://\S+')
     def __call__(self, result, options):
         urls = self.urlmatch.findall(result['text'])

-        return u'\n'.join(urls) if urls else ""
+        return '\n'.join(urls) if urls else ""

 
 class AnsiSearchFormatter(object):
     def __init__(self):
 
 class AnsiSearchFormatter(object):
     def __init__(self):


@@ -207,10 +303,10 @@ class AnsiSearchFormatter(object):
 
     def __call__(self, result, options):
         colour = self._colourMap.colourFor(result['from_user'])
 
     def __call__(self, result, options):
         colour = self._colourMap.colourFor(result['from_user'])

-        return (u"%s%s%s%s %s" %(
+        return ("%s%s%s%s %s" % (

             get_time_string(result, options, "%a, %d %b %Y %H:%M:%S +0000"),
             get_time_string(result, options, "%a, %d %b %Y %H:%M:%S +0000"),

-            ansi.cmdColour(colour), result['from_user'],
-            ansi.cmdReset(), result['text']))
+            ansiFormatter.cmdColour(colour), result['from_user'],
+            ansiFormatter.cmdReset(), result['text']))

 
 _term_encoding = None
 def get_term_encoding():
 
 _term_encoding = None
 def get_term_encoding():


@@ -227,6 +323,7 @@ formatters = {}
 status_formatters = {
     'default': StatusFormatter,
     'verbose': VerboseStatusFormatter,
 status_formatters = {
     'default': StatusFormatter,
     'verbose': VerboseStatusFormatter,

+    'json': JSONStatusFormatter,

     'urls': URLStatusFormatter,
     'ansi': AnsiStatusFormatter
 }
     'urls': URLStatusFormatter,
     'ansi': AnsiStatusFormatter
 }


@@ -248,23 +345,31 @@ search_formatters = {
 }
 formatters['search'] = search_formatters
 
 }
 formatters['search'] = search_formatters
 

+lists_formatters = {
+    'default': ListsFormatter,
+    'verbose': ListsVerboseFormatter,
+    'urls': None,
+    'ansi': AnsiListsFormatter
+}
+formatters['lists'] = lists_formatters
+

 def get_formatter(action_type, options):
     formatters_dict = formatters.get(action_type)
     if (not formatters_dict):
         raise TwitterError(
             "There was an error finding a class of formatters for your type (%s)"
 def get_formatter(action_type, options):
     formatters_dict = formatters.get(action_type)
     if (not formatters_dict):
         raise TwitterError(
             "There was an error finding a class of formatters for your type (%s)"

-            %(action_type))
+            % (action_type))

     f = formatters_dict.get(options['format'])
     if (not f):
         raise TwitterError(
     f = formatters_dict.get(options['format'])
     if (not f):
         raise TwitterError(

-            "Unknown formatter '%s' for status actions" %(options['format']))
+            "Unknown formatter '%s' for status actions" % (options['format']))

     return f()
 
 class Action(object):
 
     def ask(self, subject='perform this action', careful=False):
         '''
     return f()
 
 class Action(object):
 
     def ask(self, subject='perform this action', careful=False):
         '''

-        Requests fromt he user using `raw_input` if `subject` should be
+        Requests from the user using `raw_input` if `subject` should be

         performed. When `careful`, the default answer is NO, otherwise YES.
         Returns the user answer in the form `True` or `False`.
         '''
         performed. When `careful`, the default answer is NO, otherwise YES.
         Returns the user answer in the form `True` or `False`.
         '''


@@ -272,15 +377,15 @@ class Action(object):
         if not careful:
             sample = '(Y/n)'
 
         if not careful:
             sample = '(Y/n)'
 

-        prompt = 'You really want to %s %s? ' %(subject, sample)
+        prompt = 'You really want to %s %s? ' % (subject, sample)

         try:
         try:

-            answer = raw_input(prompt).lower()
+            answer = input(prompt).lower()

             if careful:
                 return answer in ('yes', 'y')
             else:
                 return answer not in ('no', 'n')
         except EOFError:
             if careful:
                 return answer in ('yes', 'y')
             else:
                 return answer not in ('no', 'n')
         except EOFError:

-            print >>sys.stderr # Put Newline since Enter was never pressed
+            print(file=sys.stderr)  # Put Newline since Enter was never pressed

             # TODO:
                 #   Figure out why on OS X the raw_input keeps raising
                 #   EOFError and is never able to reset and get more input
             # TODO:
                 #   Figure out why on OS X the raw_input keeps raising
                 #   EOFError and is never able to reset and get more input


@@ -297,11 +402,12 @@ class Action(object):
             if (options['refresh'] and isinstance(action, StatusAction)):
                 while True:
                     doAction()
             if (options['refresh'] and isinstance(action, StatusAction)):
                 while True:
                     doAction()

+                    sys.stdout.flush()

                     time.sleep(options['refresh_rate'])
             else:
                 doAction()
         except KeyboardInterrupt:
                     time.sleep(options['refresh_rate'])
             else:
                 doAction()
         except KeyboardInterrupt:

-            print >>sys.stderr, '\n[Keyboard Interrupt]'
+            print('\n[Keyboard Interrupt]', file=sys.stderr)

             pass
 
 class NoSuchActionError(Exception):
             pass
 
 class NoSuchActionError(Exception):


@@ -309,13 +415,7 @@ class NoSuchActionError(Exception):
 
 class NoSuchAction(Action):
     def __call__(self, twitter, options):
 
 class NoSuchAction(Action):
     def __call__(self, twitter, options):

-        raise NoSuchActionError("No such action: %s" %(options['action']))
-
-def printNicely(string):
-    if sys.stdout.encoding:
-        print string.encode(sys.stdout.encoding, 'replace')
-    else:
-        print string.encode('utf-8')
+        raise NoSuchActionError("No such action: %s" % (options['action']))

 
 class StatusAction(Action):
     def __call__(self, twitter, options):
 
 class StatusAction(Action):
     def __call__(self, twitter, options):


@@ -330,16 +430,15 @@ class SearchAction(Action):
     def __call__(self, twitter, options):
         # We need to be pointing at search.twitter.com to work, and it is less
         # tangly to do it here than in the main()
     def __call__(self, twitter, options):
         # We need to be pointing at search.twitter.com to work, and it is less
         # tangly to do it here than in the main()

-        twitter.domain="search.twitter.com"
-        twitter.uri=""
+        twitter.domain = "search.twitter.com"
+        twitter.uriparts = ()

         # We need to bypass the TwitterCall parameter encoding, so we
         # don't encode the plus sign, so we have to encode it ourselves
         query_string = "+".join(
         # We need to bypass the TwitterCall parameter encoding, so we
         # don't encode the plus sign, so we have to encode it ourselves
         query_string = "+".join(

-            [quote(term.decode(get_term_encoding()))
+            [quote(term)

              for term in options['extra_args']])
              for term in options['extra_args']])

-        twitter.encoded_args = "q=%s" %(query_string)

 
 

-        results = twitter.search()['results']
+        results = twitter.search(q=query_string)['results']

         f = get_formatter('search', options)
         for result in results:
             resultStr = f(result, options)
         f = get_formatter('search', options)
         for result in results:
             resultStr = f(result, options)


@@ -353,55 +452,105 @@ class AdminAction(Action):
         af = get_formatter('admin', options)
         try:
             user = self.getUser(twitter, options['extra_args'][0])
         af = get_formatter('admin', options)
         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
+        except TwitterError as 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:
             printNicely(af(options['action'], user))
 
         else:
             printNicely(af(options['action'], user))
 

-class FriendsAction(StatusAction):
+class ListsAction(StatusAction):

     def getStatuses(self, twitter, options):
     def getStatuses(self, twitter, options):

-        return reversed(twitter.statuses.friends_timeline(count=options["length"]))
+        if not options['extra_args']:
+            raise TwitterError("Please provide a user to query for lists")
+
+        screen_name = options['extra_args'][0]
+
+        if not options['extra_args'][1:]:
+            lists = twitter.lists.list(screen_name=screen_name)
+            if not lists:
+                printNicely("This user has no lists.")
+            for list in lists:
+                lf = get_formatter('lists', options)
+                printNicely(lf(list))
+            return []
+        else:
+            return reversed(twitter.user.lists.list.statuses(
+                    user=screen_name, list=options['extra_args'][1]))
+
+
+class MyListsAction(ListsAction):
+    def getStatuses(self, twitter, options):
+        screen_name = twitter.account.verify_credentials()['screen_name']
+        options['extra_args'].insert(0, screen_name)
+        return ListsAction.getStatuses(self, twitter, options)
+

 
 

-class PublicAction(StatusAction):
+class FriendsAction(StatusAction):

     def getStatuses(self, twitter, options):
     def getStatuses(self, twitter, options):

-        return reversed(twitter.statuses.public_timeline(count=options["length"]))
+        return reversed(twitter.statuses.home_timeline(count=options["length"]))

 
 class RepliesAction(StatusAction):
     def getStatuses(self, twitter, options):
 
 class RepliesAction(StatusAction):
     def getStatuses(self, twitter, options):

-        return reversed(twitter.statuses.replies(count=options["length"]))
+        return reversed(twitter.statuses.mentions_timeline(count=options["length"]))

 
 class FollowAction(AdminAction):
     def getUser(self, twitter, user):
 
 class FollowAction(AdminAction):
     def getUser(self, twitter, user):

-        return twitter.friendships.create(id=user)
+        return twitter.friendships.create(screen_name=user)

 
 class LeaveAction(AdminAction):
     def getUser(self, twitter, user):
 
 class LeaveAction(AdminAction):
     def getUser(self, twitter, user):

-        return twitter.friendships.destroy(id=user)
+        return twitter.friendships.destroy(screen_name=user)

 
 class SetStatusAction(Action):
     def __call__(self, twitter, options):
 
 class SetStatusAction(Action):
     def __call__(self, twitter, options):

-        statusTxt = (" ".join(options['extra_args']).decode(get_term_encoding())
+        statusTxt = (" ".join(options['extra_args'])

                      if options['extra_args']
                      if options['extra_args']

-                     else unicode(raw_input("message: ")))
-        status = (statusTxt.encode('utf8', 'replace'))
-        twitter.statuses.update(status=status)
+                     else str(input("message: ")))
+        replies = []
+        ptr = re.compile("@[\w_]+")
+        while statusTxt:
+            s = ptr.match(statusTxt)
+            if s and s.start() == 0:
+                replies.append(statusTxt[s.start():s.end()])
+                statusTxt = statusTxt[s.end() + 1:]
+            else:
+                break
+        replies = " ".join(replies)
+        if len(replies) >= 140:
+            # just go back
+            statusTxt = replies
+            replies = ""
+
+        splitted = []
+        while statusTxt:
+            limit = 140 - len(replies)
+            if len(statusTxt) > limit:
+                end = string.rfind(statusTxt, ' ', 0, limit)
+            else:
+                end = limit
+            splitted.append(" ".join((replies, statusTxt[:end])))
+            statusTxt = statusTxt[end:]
+
+        if options['invert_split']:
+            splitted.reverse()
+        for status in splitted:
+            twitter.statuses.update(status=status)

 
 class TwitterShell(Action):
 
     def render_prompt(self, prompt):
         '''Parses the `prompt` string and returns the rendered version'''
 
 class TwitterShell(Action):
 
     def render_prompt(self, prompt):
         '''Parses the `prompt` string and returns the rendered version'''

-        prompt = prompt.strip("'").replace("\\'","'")
+        prompt = prompt.strip("'").replace("\\'", "'")

         for colour in ansi.COLOURS_NAMED:
         for colour in ansi.COLOURS_NAMED:

-            if '[%s]' %(colour) in prompt:
+            if '[%s]' % (colour) in prompt:

                 prompt = prompt.replace(
                 prompt = prompt.replace(

-                    '[%s]' %(colour), ansi.cmdColourNamed(colour))
-        prompt = prompt.replace('[R]', ansi.cmdReset())
+                    '[%s]' % (colour), ansiFormatter.cmdColourNamed(colour))
+        prompt = prompt.replace('[R]', ansiFormatter.cmdReset())

         return prompt
 
     def __call__(self, twitter, options):
         return prompt
 
     def __call__(self, twitter, options):


@@ -409,55 +558,73 @@ class TwitterShell(Action):
         while True:
             options['action'] = ""
             try:
         while True:
             options['action'] = ""
             try:

-                args = raw_input(prompt).split()
+                args = input(prompt).split()

                 parse_args(args, options)
                 if not options['action']:
                     continue
                 elif options['action'] == 'exit':
                     raise SystemExit(0)
                 elif options['action'] == 'shell':
                 parse_args(args, options)
                 if not options['action']:
                     continue
                 elif options['action'] == 'exit':
                     raise SystemExit(0)
                 elif options['action'] == 'shell':

-                    print >>sys.stderr, 'Sorry Xzibit does not work here!'
+                    print('Sorry Xzibit does not work here!', file=sys.stderr)

                     continue
                 elif options['action'] == 'help':
                     continue
                 elif options['action'] == 'help':

-                    print >>sys.stderr, '''\ntwitter> `action`\n
+                    print('''\ntwitter> `action`\n

                           The Shell Accepts all the command line actions along with:
 
                           exit    Leave the twitter shell (^D may also be used)
 
                           The Shell Accepts all the command line actions along with:
 
                           exit    Leave the twitter shell (^D may also be used)
 

-                          Full CMD Line help is appended below for your convinience.'''
+                          Full CMD Line help is appended below for your convinience.''', file=sys.stderr)

                 Action()(twitter, options)
                 options['action'] = ''
                 Action()(twitter, options)
                 options['action'] = ''

-            except NoSuchActionError, e:
-                print >>sys.stderr, e
+            except NoSuchActionError as e:
+                print(e, file=sys.stderr)

             except KeyboardInterrupt:
             except KeyboardInterrupt:

-                print >>sys.stderr, '\n[Keyboard Interrupt]'
+                print('\n[Keyboard Interrupt]', file=sys.stderr)

             except EOFError:
             except EOFError:

-                print >>sys.stderr
+                print(file=sys.stderr)

                 leaving = self.ask(subject='Leave')
                 if not leaving:
                 leaving = self.ask(subject='Leave')
                 if not leaving:

-                    print >>sys.stderr, 'Excellent!'
+                    print('Excellent!', file=sys.stderr)

                 else:
                     raise SystemExit(0)
 
                 else:
                     raise SystemExit(0)
 

+class PythonPromptAction(Action):
+    def __call__(self, twitter, options):
+        try:
+            while True:
+                smrt_input(globals(), locals())
+        except EOFError:
+            pass
+

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

-        print __doc__
+        print(__doc__)

 
 class DoNothingAction(Action):
     def __call__(self, twitter, options):
         pass
 
 
 class DoNothingAction(Action):
     def __call__(self, twitter, options):
         pass
 

+class RateLimitStatus(Action):
+    def __call__(self, twitter, options):
+        rate = twitter.account.rate_limit_status()
+        print("Remaining API requests: %s / %s (hourly limit)" % (rate['remaining_hits'], rate['hourly_limit']))
+        print("Next reset in %ss (%s)" % (int(rate['reset_time_in_seconds'] - time.time()),
+                                          time.asctime(time.localtime(rate['reset_time_in_seconds']))))
+

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

+    'list'      : ListsAction,
+    'mylist'    : MyListsAction,

     'help'      : HelpAction,
     'leave'     : LeaveAction,
     'help'      : HelpAction,
     'leave'     : LeaveAction,

-    'public'    : PublicAction,
+    'pyprompt'  : PythonPromptAction,

     'replies'   : RepliesAction,
     'search'    : SearchAction,
     'set'       : SetStatusAction,
     'shell'     : TwitterShell,
     'replies'   : RepliesAction,
     'search'    : SearchAction,
     'set'       : SetStatusAction,
     'shell'     : TwitterShell,

+    'rate'      : RateLimitStatus,

 }
 
 def loadConfig(filename):
 }
 
 def loadConfig(filename):


@@ -468,15 +635,19 @@ def loadConfig(filename):
         for option in ('format', 'prompt'):
             if cp.has_option('twitter', option):
                 options[option] = cp.get('twitter', option)
         for option in ('format', 'prompt'):
             if cp.has_option('twitter', option):
                 options[option] = cp.get('twitter', option)

+        # process booleans
+        for option in ('invert_split',):
+            if cp.has_option('twitter', option):
+                options[option] = cp.getboolean('twitter', option)

     return options
 
 def main(args=sys.argv[1:]):
     arg_options = {}
     try:
         parse_args(args, arg_options)
     return options
 
 def main(args=sys.argv[1:]):
     arg_options = {}
     try:
         parse_args(args, arg_options)

-    except GetoptError, e:
-        print >> sys.stderr, "I can't do that, %s." %(e)
-        print >> sys.stderr
+    except GetoptError as e:
+        print("I can't do that, %s." % (e), file=sys.stderr)
+        print(file=sys.stderr)

         raise SystemExit(1)
 
     config_path = os.path.expanduser(
         raise SystemExit(1)
 
     config_path = os.path.expanduser(


@@ -488,13 +659,13 @@ def main(args=sys.argv[1:]):
     # arguments.
     options = dict(OPTIONS)
     for d in config_options, arg_options:
     # arguments.
     options = dict(OPTIONS)
     for d in config_options, arg_options:

-        for k,v in d.items():
+        for k, v in list(d.items()):

             if v: options[k] = v
 
     if options['refresh'] and options['action'] not in (
             if v: options[k] = v
 
     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."
+        'friends', 'replies'):
+        print("You can only refresh the friends or replies actions.", file=sys.stderr)
+        print("Use 'twitter -h' for help.", file=sys.stderr)

         return 1
 
     oauth_filename = os.path.expanduser(options['oauth_filename'])
         return 1
 
     oauth_filename = os.path.expanduser(options['oauth_filename'])


@@ -505,21 +676,24 @@ def main(args=sys.argv[1:]):
             "the Command-Line Tool", CONSUMER_KEY, CONSUMER_SECRET,
             options['oauth_filename'])
 
             "the Command-Line Tool", CONSUMER_KEY, CONSUMER_SECRET,
             options['oauth_filename'])
 

+    global ansiFormatter
+    ansiFormatter = ansi.AnsiCmd(options["force-ansi"])
+

     oauth_token, oauth_token_secret = read_token_file(oauth_filename)
 
     twitter = Twitter(
         auth=OAuth(
             oauth_token, oauth_token_secret, CONSUMER_KEY, CONSUMER_SECRET),
         secure=options['secure'],
     oauth_token, oauth_token_secret = read_token_file(oauth_filename)
 
     twitter = Twitter(
         auth=OAuth(
             oauth_token, oauth_token_secret, CONSUMER_KEY, CONSUMER_SECRET),
         secure=options['secure'],

-        api_version='1',
+        api_version='1.1',

         domain='api.twitter.com')
 
     try:
         Action()(twitter, options)
         domain='api.twitter.com')
 
     try:
         Action()(twitter, options)

-    except NoSuchActionError, e:
-        print >>sys.stderr, e
+    except NoSuchActionError as e:
+        print(e, file=sys.stderr)

         raise SystemExit(1)
         raise SystemExit(1)

-    except TwitterError, e:
-        print >> sys.stderr, str(e)
-        print >> sys.stderr, "Use 'twitter -h' for help."
+    except TwitterError as e:
+        print(str(e), file=sys.stderr)
+        print("Use 'twitter -h' for help.", file=sys.stderr)

         raise SystemExit(1)
         raise SystemExit(1)