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 F3FBF138350 for ; Fri, 10 Apr 2020 21:04:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C86BE0A8D; Fri, 10 Apr 2020 21:04:41 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 06F4DE0A8D for ; Fri, 10 Apr 2020 21:04:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D942A34EF4E for ; Fri, 10 Apr 2020 21:04:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C838F1E8 for ; Fri, 10 Apr 2020 21:04:37 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1586504059.481d0321fc1278e9a1a0af328c0b4cf14013ff3c.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 481d0321fc1278e9a1a0af328c0b4cf14013ff3c X-VCS-Branch: master Date: Fri, 10 Apr 2020 21:04:37 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d55d96cc-8a86-43ae-b76e-97d7e91d0421 X-Archives-Hash: 5d4c517648495a78ce287e5e52e3c5a0 commit: 481d0321fc1278e9a1a0af328c0b4cf14013ff3c Author: Matt Turner gentoo org> AuthorDate: Fri Apr 10 07:34:19 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Apr 10 07:34:19 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=481d0321 catalyst: Remove some python-2 left-overs Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 53d39536..320e9d53 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -20,11 +20,6 @@ from catalyst.lock import LockDir, LockInUse from catalyst.fileops import ensure_dirs, pjoin, clear_dir, clear_path from catalyst.base.resume import AutoResume -if sys.version_info[0] >= 3: - py_input = input -else: - py_input = raw_input # pylint: disable=undefined-variable - class StageBase(TargetBase, ClearBase, GenBase): """ @@ -1697,6 +1692,6 @@ class StageBase(TargetBase, ClearBase, GenBase): @staticmethod def _debug_pause_(): - py_input("press any key to continue: ") + input("press any key to continue: ") # vim: ts=4 sw=4 sta et sts=4 ai