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 32D2A138CD0 for ; Sun, 31 May 2015 05:03:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12EA3E08FE; Sun, 31 May 2015 05:03:25 +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 DAD53E08C4 for ; Sun, 31 May 2015 05:03:23 +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 414CA340C53 for ; Sun, 31 May 2015 05:03:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B69A6A2E for ; Sun, 31 May 2015 05:03:19 +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: <1433028546.35ecad248a81436dcad7e6b9928ed3eeb098c9af.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys/gkeys/seed.py X-VCS-Directories: gkeys/gkeys/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 35ecad248a81436dcad7e6b9928ed3eeb098c9af X-VCS-Branch: master Date: Sun, 31 May 2015 05:03:19 +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: 7ce3b57b-28dc-42f9-890e-87ddf6df9c3a X-Archives-Hash: db4d8ae2024ad27b6040e0c8b9f75e31 commit: 35ecad248a81436dcad7e6b9928ed3eeb098c9af Author: Brian Dolbec gentoo org> AuthorDate: Mon Apr 20 17:44:59 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat May 30 23:29:06 2015 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=35ecad24 gkeys/seed.py: Replace codecs usage with unicode() Add a noop for an empty kwargs[key]. jgjhgj gkeys/gkeys/seed.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gkeys/gkeys/seed.py b/gkeys/gkeys/seed.py index 985f6a1..01ca5a5 100644 --- a/gkeys/gkeys/seed.py +++ b/gkeys/gkeys/seed.py @@ -36,7 +36,7 @@ if sys.version_info[0] >= 3: return text else: def decoder(text, enc='utf_8'): - return codecs.decode(text, enc) + return unicode(text) class Seeds(object): @@ -155,6 +155,8 @@ class Seeds(object): keys = kwargs result = self.seeds for key in keys: + if not kwargs[key]: + continue if key in ['fingerprint', 'keys', 'keyid']: kwargs[key] = [x.replace(' ', '').upper() for x in kwargs[key]] if key in ['fingerprint', 'keys', 'uid']: