Using upstream ANSI colors.

diff --git a/twitter/cmdline.py b/twitter/cmdline.py
index dd3014d9f6f617612385bf7bfc349b43bacd3a02..0a8c413be8fb08a446db132081d72ca2ecff9376 100644 (file)
--- 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):