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 1Qb5it-0007nz-CN for garchives@archives.gentoo.org; Mon, 27 Jun 2011 06:55:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC9551C043; Mon, 27 Jun 2011 06:54:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8CF3E1C043 for ; Mon, 27 Jun 2011 06:54:59 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 059151BC02E for ; Mon, 27 Jun 2011 06:54:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1B9D68003C for ; Mon, 27 Jun 2011 06:54:58 +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: <7587568f3133d12ef68b633328954cb838fcaafe.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Package.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7587568f3133d12ef68b633328954cb838fcaafe Date: Mon, 27 Jun 2011 06:54:58 +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: X-Archives-Hash: 181e4ae50ace484281f21af1faf1a9a8 commit: 7587568f3133d12ef68b633328954cb838fcaafe Author: Zac Medico gentoo org> AuthorDate: Mon Jun 27 06:53:58 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jun 27 06:53:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7587568f Package.use: share identical frozenset instances --- pym/_emerge/Package.py | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index 7a25638..20c72b4 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -392,6 +392,9 @@ class Package(Task): __slots__ =3D ("enabled", "_expand", "_expand_hidden", "_force", "_pkg", "_mask") =20 + # Share identical frozenset instances when available. + _frozensets =3D {} + def __init__(self, pkg, use_str): self._pkg =3D pkg self._expand =3D None @@ -410,12 +413,17 @@ class Package(Task): =20 def _init_force_mask(self): pkgsettings =3D self._pkg._get_pkgsettings() - self._expand =3D frozenset( + frozensets =3D self._frozensets + s =3D frozenset( pkgsettings.get("USE_EXPAND", "").lower().split()) - self._expand_hidden =3D frozenset( + self._expand =3D frozensets.setdefault(s, s) + s =3D frozenset( pkgsettings.get("USE_EXPAND_HIDDEN", "").lower().split()) - self._force =3D pkgsettings.useforce - self._mask =3D pkgsettings.usemask + self._expand_hidden =3D frozensets.setdefault(s, s) + s =3D pkgsettings.useforce + self._force =3D frozensets.setdefault(s, s) + s =3D pkgsettings.usemask + self._mask =3D frozensets.setdefault(s, s) =20 @property def expand(self):