From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RaVia-0000PI-9E for garchives@archives.gentoo.org; Tue, 13 Dec 2011 17:00:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A94121C08C; Tue, 13 Dec 2011 17:00:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1F12621C08C for ; Tue, 13 Dec 2011 17:00:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 97F621B4029 for ; Tue, 13 Dec 2011 17:00:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0B4BB8004A for ; Tue, 13 Dec 2011 17:00:32 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <70d7c7bfb20dec3fa66b0e6c1d9729ac87cab577.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 70d7c7bfb20dec3fa66b0e6c1d9729ac87cab577 Date: Tue, 13 Dec 2011 17:00:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 1c9a6d98-f954-4101-b4a1-7bbac7ffde23 X-Archives-Hash: 6dcbfe09173ab1f87ab121e2db06168c commit: 70d7c7bfb20dec3fa66b0e6c1d9729ac87cab577 Author: Zac Medico gentoo org> AuthorDate: Tue Dec 13 17:00:21 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Dec 13 17:00:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D70d7c7bf config: use frozenset for _constant_keys lookup --- pym/portage/package/ebuild/config.py | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/e= build/config.py index 9a8486c..f6166c6 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -122,6 +122,9 @@ class config(object): virtuals ...etc you look in here. """ =20 + _constant_keys =3D frozenset(['PORTAGE_BIN_PATH', 'PORTAGE_GID', + 'PORTAGE_PYM_PATH']) + _setcpv_aux_keys =3D ('DEFINED_PHASES', 'DEPEND', 'EAPI', 'INHERITED', 'IUSE', 'REQUIRED_USE', 'KEYWORDS', 'LICENSE', 'PDEPEND', 'PROPERTIES', 'PROVIDE', 'RDEPEND', 'SLOT', @@ -2126,14 +2129,16 @@ class config(object): =20 def _getitem(self, mykey): =20 - # These ones point to temporary values when - # portage plans to update itself. - if mykey =3D=3D "PORTAGE_BIN_PATH": - return portage._bin_path - elif mykey =3D=3D "PORTAGE_PYM_PATH": - return portage._pym_path - elif mykey =3D=3D "PORTAGE_GID": - return _unicode_decode(str(portage_gid)) + if mykey in self._constant_keys: + # These two point to temporary values when + # portage plans to update itself. + if mykey =3D=3D "PORTAGE_BIN_PATH": + return portage._bin_path + elif mykey =3D=3D "PORTAGE_PYM_PATH": + return portage._pym_path + + elif mykey =3D=3D "PORTAGE_GID": + return _unicode_decode(str(portage_gid)) =20 for d in self.lookuplist: try: @@ -2186,9 +2191,7 @@ class config(object): =20 def __iter__(self): keys =3D set() - keys.add("PORTAGE_BIN_PATH") - keys.add("PORTAGE_PYM_PATH") - keys.add("PORTAGE_GID") + keys.update(self._constant_keys) for d in self.lookuplist: keys.update(d) return iter(keys)