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 BA6871382C5 for ; Sat, 6 Mar 2021 09:06:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3247E077D; Sat, 6 Mar 2021 09:06:01 +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 D1B1EE077D for ; Sat, 6 Mar 2021 09:06:01 +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 81DC3340DED for ; Sat, 6 Mar 2021 09:06:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07AAB53 for ; Sat, 6 Mar 2021 09:05:59 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1615021298.9003c5201c6503ddad9237bcffbc6f775567661b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/__init__.py X-VCS-Directories: lib/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9003c5201c6503ddad9237bcffbc6f775567661b X-VCS-Branch: master Date: Sat, 6 Mar 2021 09:05:59 +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: 714bf31d-c5d3-4f9a-bff6-53a1db9e03e3 X-Archives-Hash: 903d4477cd07f293804c5498a03317ac commit: 9003c5201c6503ddad9237bcffbc6f775567661b Author: Matt Turner gentoo org> AuthorDate: Thu Mar 4 19:23:45 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 6 09:01:38 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9003c520 Remove Python 2 workaround Signed-off-by: Matt Turner gentoo.org> Signed-off-by: Zac Medico gentoo.org> lib/portage/__init__.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py index 24c9d8b89..d33792a77 100644 --- a/lib/portage/__init__.py +++ b/lib/portage/__init__.py @@ -484,11 +484,7 @@ def _eapi_is_deprecated(eapi): return eapi in _deprecated_eapis def eapi_is_supported(eapi): - if not isinstance(eapi, str): - # Only call str() when necessary since with python2 it - # can trigger UnicodeEncodeError if EAPI is corrupt. - eapi = str(eapi) - eapi = eapi.strip() + eapi = str(eapi).strip() return eapi in _supported_eapis