Merge branch 'select_num_statuses'

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

diff --git a/twitter/cmdline.py b/twitter/cmdline.py
index 0db8feb58eb3255b6d2d7b930adbc5d2b2effc55..c70e7054cf69b88bfedac4cb19d138ffe65c5a4c 100644 (file)
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -202,6 +202,12 @@ class NoSuchAction(Action):
         print >> sys.stderr, "No such action: ", options['action']
         sys.exit(1)
 
+def printNicely(string):        
+    if sys.stdout.encoding:
+        print string.encode(sys.stdout.encoding, 'replace')
+    else:
+        print string.encode('utf-8')
+        
 class StatusAction(Action):
     def __call__(self, twitter, options):
         statuses = self.getStatuses(twitter, options)
@@ -209,7 +215,7 @@ class StatusAction(Action):
         for status in statuses:
             statusStr = sf(status, options)
             if statusStr.strip():
-                print statusStr.encode(sys.stdout.encoding, 'replace')
+                printNicely(statusStr)
 
 class AdminAction(Action):
     def __call__(self, twitter, options):
@@ -227,7 +233,7 @@ class AdminAction(Action):
             print
             print e
         else:
-            print af(options['action'], user).encode(sys.stdout.encoding, 'replace')
+            printNicely(af(options['action'], user))
 
 class FriendsAction(StatusAction):
     def getStatuses(self, twitter, options):