Improved display of multiline tweets.

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

diff --git a/twitter/cmdline.py b/twitter/cmdline.py
index 120d629b11eb1e1e6719defa49b5407e5af69d89..dd3014d9f6f617612385bf7bfc349b43bacd3a02 100644 (file)
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -103,7 +103,7 @@ 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
+from .util import smrt_input, printNicely, align_text
 
 OPTIONS = {
     'action': 'friends',
@@ -217,10 +217,12 @@ class AnsiStatusFormatter(object):
 
     def __call__(self, status, options):
         colour = self._colourMap.colourFor(status['user']['screen_name'])
-        return ("%s%s% 16s%s %s" %(
+        ret = "%s%s% 16s%s " %(
             get_time_string(status, options),
-            ansiFormatter.cmdColour(colour), status['user']['screen_name'],
-            ansiFormatter.cmdReset(), replaceInStatus(status['text'])))
+            ansi.cmdColour(colour), status['user']['screen_name'],
+            ansi.cmdReset())
+        ret += "%s" % align_text(status['text'])
+        return ret
 
 class VerboseStatusFormatter(object):
     def __call__(self, status, options):