Merge branch 'master' into py3-2

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

diff --git a/twitter/cmdline.py b/twitter/cmdline.py
index e6f04b0fde4fd1a57331ddedfa82479d38759cd0..fdf01fc4c0a558d47d90eef654a0ea360e42e379 100644 (file)
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -350,10 +350,8 @@ class NoSuchAction(Action):
         raise NoSuchActionError("No such action: %s" %(options['action']))
 
 def printNicely(string):
-    if sys.stdout.encoding:
-        print(string.encode(sys.stdout.encoding, 'replace'))
-    else:
-        print(string.encode('utf-8'))
+    sys.stdout.buffer.write(string.encode('utf8'))
+    print()
 
 class StatusAction(Action):
     def __call__(self, twitter, options):
@@ -373,7 +371,7 @@ class SearchAction(Action):
         # 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(
-            [quote(term.decode(get_term_encoding()))
+            [quote(term)
              for term in options['extra_args']])
 
         results = twitter.search(q=query_string)['results']
@@ -450,11 +448,10 @@ class LeaveAction(AdminAction):
 
 class SetStatusAction(Action):
     def __call__(self, twitter, options):
-        statusTxt = (" ".join(options['extra_args']).decode(get_term_encoding())
+        statusTxt = (" ".join(options['extra_args'])
                      if options['extra_args']
                      else str(input("message: ")))
-        status = (statusTxt.encode('utf8', 'replace'))
-        twitter.statuses.update(status=status)
+        twitter.statuses.update(status=statusTxt)
 
 class TwitterShell(Action):