From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C667E138334 for ; Sat, 7 Jul 2018 05:24:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35216E0B66; Sat, 7 Jul 2018 05:23:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EF939E0B64 for ; Sat, 7 Jul 2018 05:23:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90E54335C99 for ; Sat, 7 Jul 2018 05:23:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 84F89368 for ; Sat, 7 Jul 2018 05:23:50 +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: <1530940932.815569288668888bbd0df549f615a0813bfcb648.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys-gen/gkeygen/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys-gen/gkeygen/actions.py X-VCS-Directories: gkeys-gen/gkeygen/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 815569288668888bbd0df549f615a0813bfcb648 X-VCS-Branch: master Date: Sat, 7 Jul 2018 05:23:50 +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: d2065955-d6a1-4a6b-8dba-a89677e5e8b9 X-Archives-Hash: 248d54fd3b62d3b8a32d618a0fe9d7ba commit: 815569288668888bbd0df549f615a0813bfcb648 Author: Brian Dolbec gentoo org> AuthorDate: Tue Jul 3 07:12:08 2018 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Jul 7 05:22:12 2018 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=81556928 gkeysgen/actions.py: Use gkeys py_input and _unicode declarations Signed-off-by: Brian Dolbec gentoo.org> gkeys-gen/gkeygen/actions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gkeys-gen/gkeygen/actions.py b/gkeys-gen/gkeygen/actions.py index bd4a6ef..fc7a801 100644 --- a/gkeys-gen/gkeygen/actions.py +++ b/gkeys-gen/gkeygen/actions.py @@ -19,13 +19,13 @@ from collections import OrderedDict if sys.version_info[0] >= 3: from urllib.request import urlopen - py_input = input - _unicode = str else: from urllib2 import urlopen - py_input = raw_input - _unicode = unicode +from gkeys import ( + py_input, + _unicode, +) from gkeys.fileops import ensure_dirs from gkeys import log @@ -140,7 +140,7 @@ class Actions(object): shutil.copy(skelconfpath, newgpgconfpath) with open(newgpgconfpath, 'a') as conf: for line in urlopen(self.config.get_key('gpg-urls', args.spec)): - conf.write(_unicode(line.decode('utf-8'))) + conf.write(_unicode(line.decode('utf-8'))) def genkey(self, args):