From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8BDA8138AD0 for ; Fri, 9 Jan 2015 21:07:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 953BEE086E; Fri, 9 Jan 2015 21:07:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F068BE086E for ; Fri, 9 Jan 2015 21:07:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04FD434078A for ; Fri, 9 Jan 2015 21:07:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B44F9F3A8 for ; Fri, 9 Jan 2015 21:07:27 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1420751267.e493576420d6396481cd5e74ddfc29d20946df32.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys/gkeys/base.py X-VCS-Directories: gkeys/gkeys/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: e493576420d6396481cd5e74ddfc29d20946df32 X-VCS-Branch: master Date: Fri, 9 Jan 2015 21:07:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9ca2974f-20a7-4b41-89f0-a94df7db8146 X-Archives-Hash: 8f154b6d83311f0a1b7dc2aa9bba5e77 commit: e493576420d6396481cd5e74ddfc29d20946df32 Author: Brian Dolbec gentoo org> AuthorDate: Thu Jan 8 21:07:47 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 8 21:07:47 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=e4935764 Revert "gkeys/base.py: Wrap all output with _unicode_decode()" This reverts commit d947f8fc4b5d91f1655e1f7770a0f94cbb6a52a9. --- gkeys/gkeys/base.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py index 46f8f2f..7e28b90 100644 --- a/gkeys/gkeys/base.py +++ b/gkeys/gkeys/base.py @@ -17,7 +17,6 @@ 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 @@ -315,16 +314,16 @@ class CliBase(object): def output_results(results, header=None): # super simple output for the time being if header: - print(_unicode_decode(header)) + print(header) for msg in results: if type(msg) in [str, unicode]: - print(' ', _unicode_decode(msg)) + print(' ', msg) else: try: - print("\n".join([_unicode_decode(x.pretty_print) for x in msg])) + print("\n".join([x.pretty_print for x in msg])) except AttributeError: for x in msg: - print(' ', _unicode_decode(x)) + print(' ', x) print()