Merge pull request #238 from mattcen/master

[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 dd3014d..54e0531
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -217,12 +217,10 @@ class AnsiStatusFormatter(object):
 
     def __call__(self, status, options):
         colour = self._colourMap.colourFor(status['user']['screen_name'])
-        ret = "%s%s% 16s%s " %(
+        return ("%s%s% 16s%s %s " % (
             get_time_string(status, options),
-            ansi.cmdColour(colour), status['user']['screen_name'],
-            ansi.cmdReset())
-        ret += "%s" % align_text(status['text'])
-        return ret
+            ansiFormatter.cmdColour(colour), status['user']['screen_name'],
+            ansiFormatter.cmdReset(), align_text(replaceInStatus(status['text']))))
 
 class VerboseStatusFormatter(object):
     def __call__(self, status, options):
@@ -481,8 +479,8 @@ class ListsAction(StatusAction):
                 printNicely(lf(list))
             return []
         else:
-            return reversed(twitter.user.lists.list.statuses(
-                    user=screen_name, list=options['extra_args'][1]))
+            return reversed(twitter.lists.statuses(
+                    owner_screen_name=screen_name, slug=options['extra_args'][1]))
 
 
 class MyListsAction(ListsAction):