[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

[Brian Dolbec]

commit:     d947f8fc4b5d91f1655e1f7770a0f94cbb6a52a9
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  7 23:33:54 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Jan  7 23:33:54 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=d947f8fc

gkeys/base.py: Wrap all output with _unicode_decode()

Kristian was still getting py-2.7 errors for some devs due to unicode.

---
 gkeys/gkeys/base.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index 05946c2..65ad9cc 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -17,6 +17,7 @@ from __future__ import print_function
 import argparse
 import sys
 
+from pyGPG.status import _unicode_decode
 from gkeys import fileops
 from gkeys.log import log_levels, set_logger
 
@@ -311,16 +312,16 @@ class CliBase(object):
     def output_results(results, header=None):
         # super simple output for the time being
         if header:
-            print(header)
+            print(_unicode_decode(header))
         for msg in results:
             if type(msg) in [str, unicode]:
-                print('   ', msg)
+                print('   ', _unicode_decode(msg))
             else:
                 try:
-                    print("\n".join([x.pretty_print for x in msg]))
+                    print("\n".join([_unicode_decode(x.pretty_print) for x in 
msg]))
                 except AttributeError:
                     for x in msg:
-                        print('    ', x)
+                        print('    ', _unicode_decode(x))
         print()