aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavlos Ratis <dastergon@gentoo.org>2015-01-08 22:42:20 +0200
committerBrian Dolbec <dolsen@gentoo.org>2015-01-08 13:05:22 -0800
commitb547e16c7e047d9fd9ac7d9536678cf9102c2b16 (patch)
treea50e89fad682dd02d5416a65c3a5541c4fb4b8e2 /gkeys/gkeys/base.py
parentRename gkey-gen to gkeys-gen for consistency (diff)
downloadgentoo-keys-b547e16c7e047d9fd9ac7d9536678cf9102c2b16.tar.gz
gentoo-keys-b547e16c7e047d9fd9ac7d9536678cf9102c2b16.tar.bz2
gentoo-keys-b547e16c7e047d9fd9ac7d9536678cf9102c2b16.zip
Revert "gkeys: Finally fix all the unicode printing errors"
This reverts commit b7f9364cb0952f2e06f94299400d2f23b629553d. It totally broke py-3 comaptibility!
Diffstat (limited to 'gkeys/gkeys/base.py')
-rw-r--r--gkeys/gkeys/base.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index 1a80a03..46f8f2f 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -17,7 +17,7 @@ from __future__ import print_function
import argparse
import sys
-from pyGPG.status import _unicode_encode
+from pyGPG.status import _unicode_decode
from gkeys import fileops
from gkeys.log import log_levels, set_logger
@@ -315,16 +315,16 @@ class CliBase(object):
def output_results(results, header=None):
# super simple output for the time being
if header:
- print(_unicode_encode(header))
+ print(_unicode_decode(header))
for msg in results:
if type(msg) in [str, unicode]:
- print(' ', _unicode_encode(msg))
+ print(' ', _unicode_decode(msg))
else:
try:
- print("\n".join([_unicode_encode(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(' ', _unicode_encode(x))
+ print(' ', _unicode_decode(x))
print()