Version 1.17.0

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

diff --git a/twitter/cmdline.py b/twitter/cmdline.py
old mode 100644 (file)
new mode 100755 (executable)
index 8353df3..545e8fd
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -15,7 +15,6 @@ ACTIONS:
                     tweets from that list
  mylist         get list of your lists; give a list name to get tweets
                     from that list
                     tweets from that list
  mylist         get list of your lists; give a list name to get tweets
                     from that list

- public         get latest public tweets

  pyprompt       start a Python prompt for interacting with the twitter
                     object directly
  replies        get latest replies to you
  pyprompt       start a Python prompt for interacting with the twitter
                     object directly
  replies        get latest replies to you


@@ -23,7 +22,8 @@ ACTIONS:
  set            set your twitter status
  shell          login to the twitter shell
  rate           get your current rate limit status (remaining API reqs)
  set            set your twitter status
  shell          login to the twitter shell
  rate           get your current rate limit status (remaining API reqs)

-
+ repl           begin a Read-Eval-Print-Loop with a configured twitter
+                    object

 
 OPTIONS:
 
 
 OPTIONS:
 


@@ -44,6 +44,7 @@ FORMATS for the --format option
 
  default         one line per status
  verbose         multiple lines per status, more verbose status info
 
  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)
 


@@ -64,17 +65,23 @@ prompt: <twitter_shell_prompt e.g. '[cyan]twitter[R]> '>
 
 from __future__ import print_function
 
 
 from __future__ import print_function
 

-CONSUMER_KEY='uS6hO2sV6tDKIOeVjhnFnQ'
-CONSUMER_SECRET='MEYTOS97VvlHX7K1rwHPEqVpTSqZ71HtvoK4sVuYk'
+try:
+    input = __builtins__.raw_input
+except (AttributeError, KeyError):
+    pass

 
 

-import sys
-import time
+
+CONSUMER_KEY = 'uS6hO2sV6tDKIOeVjhnFnQ'
+CONSUMER_SECRET = 'MEYTOS97VvlHX7K1rwHPEqVpTSqZ71HtvoK4sVuYk'
+
+import code

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

-from getpass import getpass
-import re
-import os.path
+import json

 import locale
 import locale

-import string
+import os.path
+import re
+import sys
+import time

 
 try:
     from ConfigParser import SafeConfigParser
 
 try:
     from ConfigParser import SafeConfigParser


@@ -85,13 +92,16 @@ try:
     from urllib.parse import quote
 except ImportError:
     from urllib2 import quote
     from urllib.parse import quote
 except ImportError:
     from urllib2 import quote

-import webbrowser
+try:
+    import HTMLParser
+except ImportError:
+    import html.parser as HTMLParser

 
 from .api import Twitter, TwitterError
 
 from .api import Twitter, TwitterError

-from .oauth import OAuth, write_token_file, read_token_file
+from .oauth import OAuth, read_token_file

 from .oauth_dance import oauth_dance
 from . import ansi
 from .oauth_dance import oauth_dance
 from . import ansi

-from .util import smrt_input, printNicely
+from .util import smrt_input, printNicely, align_text

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


@@ -99,23 +109,36 @@ 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)

-    extra_args = [arg.decode(locale.getpreferredencoding())
-                  for arg in extra_args]
+    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'):


@@ -138,17 +161,20 @@ 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]
     options['extra_args'] = extra_args[1:]
 
 
     if extra_args and not ('action' in options and options['action'] == 'help'):
         options['action'] = extra_args[0]
     options['extra_args'] = extra_args[1:]
 

+

 def get_time_string(status, options, format="%a %b %d %H:%M:%S +0000 %Y"):
     timestamp = options["timestamp"]
     datestamp = options["datestamp"]
     t = time.strptime(status['created_at'], format)
     i_hate_timezones = time.timezone
 def get_time_string(status, options, format="%a %b %d %H:%M:%S +0000 %Y"):
     timestamp = options["timestamp"]
     datestamp = options["datestamp"]
     t = time.strptime(status['created_at'], format)
     i_hate_timezones = time.timezone

-    if (time.daylight):
+    if time.daylight:

         i_hate_timezones = time.altzone
     dt = datetime.datetime(*t[:-3]) - datetime.timedelta(
         seconds=i_hate_timezones)
         i_hate_timezones = time.altzone
     dt = datetime.datetime(*t[:-3]) - datetime.timedelta(
         seconds=i_hate_timezones)


@@ -161,11 +187,46 @@ 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
+
+
+def correctRTStatus(status):
+    if 'retweeted_status' in status:
+        return ("RT @" + status['retweeted_status']['user']['screen_name']
+                + " " + status['retweeted_status']['text'])
+    else:
+        return status['text']
+
+

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

-        return ("%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(correctRTStatus(status))))
+

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


@@ -173,23 +234,33 @@ 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 ("%s%s%s%s %s" %(
+        return ("%s%s% 16s%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(),
+            align_text(replaceInStatus(correctRTStatus(status)))))
+

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

-        return ("-- %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(correctRTStatus(status))))
+
+
+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+')
 
 class URLStatusFormatter(object):
     urlmatch = re.compile(r'https?://\S+')

+

     def __call__(self, status, options):
     def __call__(self, status, options):

-        urls = self.urlmatch.findall(status['text'])
+        urls = self.urlmatch.findall(correctRTStatus(status))

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


@@ -201,29 +272,34 @@ class ListsFormatter(object):
             list_str = "%-30s" % (list['name'])
         return "%s\n" % list_str
 
             list_str = "%-30s" % (list['name'])
         return "%s\n" % list_str
 

+

 class ListsVerboseFormatter(object):
     def __call__(self, list):
 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'])
+        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
 
         return list_str
 

+

 class AnsiListsFormatter(object):
     def __init__(self):
         self._colourMap = ansi.ColourMap()
 
     def __call__(self, list):
         colour = self._colourMap.colourFor(list['name'])
 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" %(
-            ansi.cmdColour(colour), list['name'],
-            ansi.cmdReset(), list['description']))
+        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 = "%s (%s)" %(user['screen_name'], user['name'])
+        user_str = "%s (%s)" % (user['screen_name'], user['name'])

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

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

         else:
         else:

-            return "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):


@@ -233,33 +309,40 @@ class VerboseAdminFormatter(object):
             user['name'],
             user['url']))
 
             user['name'],
             user['url']))
 

+

 class SearchFormatter(object):
     def __call__(self, result, options):
 class SearchFormatter(object):
     def __call__(self, result, options):

-        return("%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']))
 
             get_time_string(result, options, "%a, %d %b %Y %H:%M:%S +0000"),
             result['from_user'], result['text']))
 

+

 class VerboseSearchFormatter(SearchFormatter):
 class VerboseSearchFormatter(SearchFormatter):

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

 
 class URLSearchFormatter(object):
     urlmatch = re.compile(r'https?://\S+')
 
 class URLSearchFormatter(object):
     urlmatch = re.compile(r'https?://\S+')

+

     def __call__(self, result, options):
         urls = self.urlmatch.findall(result['text'])
         return '\n'.join(urls) if urls else ""
 
     def __call__(self, result, options):
         urls = self.urlmatch.findall(result['text'])
         return '\n'.join(urls) if urls else ""
 

+

 class AnsiSearchFormatter(object):
     def __init__(self):
         self._colourMap = ansi.ColourMap()
 
     def __call__(self, result, options):
         colour = self._colourMap.colourFor(result['from_user'])
 class AnsiSearchFormatter(object):
     def __init__(self):
         self._colourMap = ansi.ColourMap()
 
     def __call__(self, result, options):
         colour = self._colourMap.colourFor(result['from_user'])

-        return ("%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
 
 _term_encoding = None

+
+

 def get_term_encoding():
     global _term_encoding
     if not _term_encoding:
 def get_term_encoding():
     global _term_encoding
     if not _term_encoding:


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

+    'json': JSONStatusFormatter,

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


@@ -303,23 +387,25 @@ lists_formatters = {
 }
 formatters['lists'] = lists_formatters
 
 }
 formatters['lists'] = lists_formatters
 

+

 def get_formatter(action_type, options):
     formatters_dict = formatters.get(action_type)
 def get_formatter(action_type, options):
     formatters_dict = formatters.get(action_type)

-    if (not formatters_dict):
+    if not formatters_dict:

         raise TwitterError(
             "There was an error finding a class of formatters for your type (%s)"
         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'])
     f = formatters_dict.get(options['format'])

-    if (not f):
+    if not f:

         raise TwitterError(
         raise TwitterError(

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

     return f()
 
     return f()
 

+

 class Action(object):
 
     def ask(self, subject='perform this action', careful=False):
         '''
 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`.
         '''


@@ -327,7 +413,7 @@ 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:
             answer = input(prompt).lower()
             if careful:
         try:
             answer = input(prompt).lower()
             if careful:


@@ -335,11 +421,11 @@ class Action(object):
             else:
                 return answer not in ('no', 'n')
         except EOFError:
             else:
                 return answer not in ('no', 'n')
         except EOFError:

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

             # TODO:
             # TODO:

-                #   Figure out why on OS X the raw_input keeps raising
-                #   EOFError and is never able to reset and get more input
-                #   Hint: Look at how IPython implements their console
+            #   Figure out why on OS X the raw_input keeps raising
+            #   EOFError and is never able to reset and get more input
+            #   Hint: Look at how IPython implements their console

             default = True
             if careful:
                 default = False
             default = True
             if careful:
                 default = False


@@ -348,10 +434,11 @@ class Action(object):
     def __call__(self, twitter, options):
         action = actions.get(options['action'], NoSuchAction)()
         try:
     def __call__(self, twitter, options):
         action = actions.get(options['action'], NoSuchAction)()
         try:

-            doAction = lambda : action(twitter, options)
-            if (options['refresh'] and isinstance(action, StatusAction)):
+            doAction = lambda: action(twitter, options)
+            if options['refresh'] and isinstance(action, StatusAction):

                 while True:
                     doAction()
                 while True:
                     doAction()

+                    sys.stdout.flush()

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


@@ -359,12 +446,15 @@ class Action(object):
             print('\n[Keyboard Interrupt]', file=sys.stderr)
             pass
 
             print('\n[Keyboard Interrupt]', file=sys.stderr)
             pass
 

+

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

+

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

-        raise NoSuchActionError("No such action: %s" %(options['action']))
+        raise NoSuchActionError("No such action: %s" % (options['action']))
+

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


@@ -375,12 +465,13 @@ class StatusAction(Action):
             if statusStr.strip():
                 printNicely(statusStr)
 
             if statusStr.strip():
                 printNicely(statusStr)
 

+

 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()
 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()

-        twitter.domain="search.twitter.com"
-        twitter.uriparts=()
+        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(


@@ -394,6 +485,7 @@ class SearchAction(Action):
             if resultStr.strip():
                 printNicely(resultStr)
 
             if resultStr.strip():
                 printNicely(resultStr)
 

+

 class AdminAction(Action):
     def __call__(self, twitter, options):
         if not (options['extra_args'] and options['extra_args'][0]):
 class AdminAction(Action):
     def __call__(self, twitter, options):
         if not (options['extra_args'] and options['extra_args'][0]):


@@ -412,6 +504,7 @@ class AdminAction(Action):
         else:
             printNicely(af(options['action'], user))
 
         else:
             printNicely(af(options['action'], user))
 

+

 class ListsAction(StatusAction):
     def getStatuses(self, twitter, options):
         if not options['extra_args']:
 class ListsAction(StatusAction):
     def getStatuses(self, twitter, options):
         if not options['extra_args']:


@@ -420,7 +513,7 @@ class ListsAction(StatusAction):
         screen_name = options['extra_args'][0]
 
         if not options['extra_args'][1:]:
         screen_name = options['extra_args'][0]
 
         if not options['extra_args'][1:]:

-            lists = twitter.user.lists(user=screen_name)['lists']
+            lists = twitter.lists.list(screen_name=screen_name)

             if not lists:
                 printNicely("This user has no lists.")
             for list in lists:
             if not lists:
                 printNicely("This user has no lists.")
             for list in lists:


@@ -428,8 +521,10 @@ class ListsAction(StatusAction):
                 printNicely(lf(list))
             return []
         else:
                 printNicely(lf(list))
             return []
         else:

-            return reversed(twitter.user.lists.list.statuses(
-                    user=screen_name, list=options['extra_args'][1]))
+            return list(reversed(twitter.lists.statuses(
+                count=options['length'],
+                owner_screen_name=screen_name,
+                slug=options['extra_args'][1])))

 
 
 class MyListsAction(ListsAction):
 
 
 class MyListsAction(ListsAction):


@@ -441,23 +536,25 @@ class MyListsAction(ListsAction):
 
 class FriendsAction(StatusAction):
     def getStatuses(self, twitter, options):
 
 class FriendsAction(StatusAction):
     def getStatuses(self, twitter, options):

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

 
 

-class PublicAction(StatusAction):
-    def getStatuses(self, twitter, options):
-        return reversed(twitter.statuses.public_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 list(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):


@@ -470,7 +567,7 @@ class SetStatusAction(Action):
             s = ptr.match(statusTxt)
             if s and s.start() == 0:
                 replies.append(statusTxt[s.start():s.end()])
             s = ptr.match(statusTxt)
             if s and s.start() == 0:
                 replies.append(statusTxt[s.start():s.end()])

-                statusTxt = statusTxt[s.end()+1:]
+                statusTxt = statusTxt[s.end() + 1:]

             else:
                 break
         replies = " ".join(replies)
             else:
                 break
         replies = " ".join(replies)


@@ -483,25 +580,28 @@ class SetStatusAction(Action):
         while statusTxt:
             limit = 140 - len(replies)
             if len(statusTxt) > limit:
         while statusTxt:
             limit = 140 - len(replies)
             if len(statusTxt) > limit:

-                end = string.rfind(statusTxt, ' ', 0, limit)
+                end = str.rfind(statusTxt, ' ', 0, limit)

             else:
                 end = limit
             else:
                 end = limit

-            splitted.append(" ".join((replies,statusTxt[:end])))
+            splitted.append(" ".join((replies, statusTxt[:end])))

             statusTxt = statusTxt[end:]
 
             statusTxt = statusTxt[end:]
 

+        if options['invert_split']:
+            splitted.reverse()

         for status in splitted:
             twitter.statuses.update(status=status)
 
         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):


@@ -520,11 +620,12 @@ class TwitterShell(Action):
                     continue
                 elif options['action'] == 'help':
                     print('''\ntwitter> `action`\n
                     continue
                 elif options['action'] == 'help':
                     print('''\ntwitter> `action`\n

-                          The Shell Accepts all the command line actions along with:
+                          The Shell accepts all the command line actions along with:

 
                           exit    Leave the twitter shell (^D may also be used)
 
 
                           exit    Leave the twitter shell (^D may also be used)
 

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

                 Action()(twitter, options)
                 options['action'] = ''
             except NoSuchActionError as e:
                 Action()(twitter, options)
                 options['action'] = ''
             except NoSuchActionError as e:


@@ -539,6 +640,7 @@ class TwitterShell(Action):
                 else:
                     raise SystemExit(0)
 
                 else:
                     raise SystemExit(0)
 

+

 class PythonPromptAction(Action):
     def __call__(self, twitter, options):
         try:
 class PythonPromptAction(Action):
     def __call__(self, twitter, options):
         try:


@@ -547,20 +649,50 @@ class PythonPromptAction(Action):
         except EOFError:
             pass
 
         except EOFError:
             pass
 

+

 class HelpAction(Action):
     def __call__(self, twitter, options):
         print(__doc__)
 
 class HelpAction(Action):
     def __call__(self, twitter, options):
         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):
 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']))))
+        rate = twitter.application.rate_limit_status()
+        resources = rate['resources']
+        for resource in resources:
+            for method in resources[resource]:
+                limit = resources[resource][method]['limit']
+                remaining = resources[resource][method]['remaining']
+                reset = resources[resource][method]['reset']
+
+                print("Remaining API requests for %s: %s / %s" %
+                      (method, remaining, limit))
+                print("Next reset in %ss (%s)\n" % (int(reset - time.time()),
+                      time.asctime(time.localtime(reset))))
+
+
+class ReplAction(Action):
+    def __call__(self, twitter, options):
+        upload = Twitter(
+            auth=twitter.auth,
+            domain="upload.twitter.com")
+        printNicely(
+            "\nUse the 'twitter' object to interact with"
+            " the Twitter REST API.\n"
+            "Use twitter_upload to interact with "
+            "upload.twitter.com\n\n")
+        code.interact(local={
+            "twitter": twitter,
+            "t": twitter,
+            "twitter_upload": upload,
+            "u": upload
+            })
+

 
 actions = {
     'authorize' : DoNothingAction,
 
 actions = {
     'authorize' : DoNothingAction,


@@ -570,15 +702,16 @@ actions = {
     'mylist'    : MyListsAction,
     'help'      : HelpAction,
     'leave'     : LeaveAction,
     'mylist'    : MyListsAction,
     'help'      : HelpAction,
     'leave'     : LeaveAction,

-    'public'    : PublicAction,

     'pyprompt'  : PythonPromptAction,
     'replies'   : RepliesAction,
     'search'    : SearchAction,
     'set'       : SetStatusAction,
     'shell'     : TwitterShell,
     'rate'      : RateLimitStatus,
     'pyprompt'  : PythonPromptAction,
     'replies'   : RepliesAction,
     'search'    : SearchAction,
     'set'       : SetStatusAction,
     'shell'     : TwitterShell,
     'rate'      : RateLimitStatus,

+    'repl'      : ReplAction,

 }
 
 }
 

+

 def loadConfig(filename):
     options = dict(OPTIONS)
     if os.path.exists(filename):
 def loadConfig(filename):
     options = dict(OPTIONS)
     if os.path.exists(filename):


@@ -587,14 +720,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
 
     return options
 

+

 def main(args=sys.argv[1:]):
     arg_options = {}
     try:
         parse_args(args, arg_options)
     except GetoptError as e:
 def main(args=sys.argv[1:]):
     arg_options = {}
     try:
         parse_args(args, arg_options)
     except GetoptError as e:

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

         print(file=sys.stderr)
         raise SystemExit(1)
 
         print(file=sys.stderr)
         raise SystemExit(1)
 


@@ -607,30 +745,33 @@ 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 list(d.items()):
-            if v: options[k] = v
+        for k, v in list(d.items()):
+            if v:
+                options[k] = v

 
 

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

-    if (options['action'] == 'authorize'
-        or not os.path.exists(oauth_filename)):
+    if options['action'] == 'authorize' or not os.path.exists(oauth_filename):

         oauth_dance(
             "the Command-Line Tool", CONSUMER_KEY, CONSUMER_SECRET,
             options['oauth_filename'])
 
         oauth_dance(
             "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:
         domain='api.twitter.com')
 
     try: