[gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/, gentoopm/pkgcorepm/, gentoopm/paludispm/, gentoopm/basepm/

[Michał Górny]

commit:     1e63873f70f222a087ebde05e9e75e35b2c5b59e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 18:40:04 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 18:40:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=1e63873f

Support getting hidden USEflags explicitly.

---
 gentoopm/basepm/pkg.py    |    5 ++++-
 gentoopm/paludispm/pkg.py |   28 ++++++++++++++++++++--------
 gentoopm/pkgcorepm/pkg.py |    7 +++++++
 gentoopm/portagepm/pkg.py |    7 +++++++
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/gentoopm/basepm/pkg.py b/gentoopm/basepm/pkg.py
index b2e7581..1442a5b 100644
--- a/gentoopm/basepm/pkg.py
+++ b/gentoopm/basepm/pkg.py
@@ -307,7 +307,10 @@ class PMPackage(PMAtom, FillMissingComparisons):
 	@abstractproperty
 	def use(self):
 		"""
-		Get the list of USE flags applying to the ebuild.
+		Get the list of USE flags applying to the ebuild. Iterating over the
+		list should return only the explicitly listed flags (C{IUSE}), though
+		it is also possible to explicitly get other flags (using indexing)
+		applying to the ebuild.
 
 		@type: L{SpaceSepFrozenSet}(L{PMUseFlag})
 		"""

diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py
index 7a9b244..8e77b9d 100644
--- a/gentoopm/paludispm/pkg.py
+++ b/gentoopm/paludispm/pkg.py
@@ -54,14 +54,26 @@ class PaludisChoice(PMUseFlag):
 
 class PaludisChoiceSet(SpaceSepFrozenSet):
 	def __new__(self, choices):
-		l = []
-		for group in choices:
-			if group.raw_name == 'build_options': # paludis specific
-				continue
-			for c in group:
-				if c.explicitly_listed:
-					l.append(PaludisChoice(c))
-		return SpaceSepFrozenSet.__new__(self, l)
+		def _get_iuse():
+			for group in choices:
+				if group.raw_name == 'build_options': # paludis specific
+					continue
+				for c in group:
+					if c.explicitly_listed:
+						yield PaludisChoice(c)
+
+		self._choices = choices
+		return SpaceSepFrozenSet.__new__(self, _get_iuse())
+
+	def __getitem__(self, k):
+		try:
+			return SpaceSepFrozenSet.__getitem__(self, k)
+		except KeyError:
+			for group in self._choices:
+				for c in group:
+					if str(c.name_with_prefix) == k:
+						return PaludisChoice(c)
+			raise
 
 class PaludisID(PMPackage, PaludisAtom):
 	def __init__(self, pkg, env):

diff --git a/gentoopm/pkgcorepm/pkg.py b/gentoopm/pkgcorepm/pkg.py
index 757bc90..f9281c2 100644
--- a/gentoopm/pkgcorepm/pkg.py
+++ b/gentoopm/pkgcorepm/pkg.py
@@ -63,6 +63,13 @@ class PkgCoreUseSet(SpaceSepFrozenSet):
 		self._use = use
 		return SpaceSepFrozenSet.__new__(self, _get_iuse())
 
+	def __getitem__(self, k):
+		try:
+			return SpaceSepFrozenSet.__getitem__(self, k)
+		except KeyError:
+			# XXX, incorrect flags?
+			return PkgCoreUseFlag(k, self._use)
+
 class PkgCorePackage(PMPackage, PkgCoreAtom):
 	def __init__(self, pkg, repo_index = 0):
 		self._pkg = pkg

diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py
index 9ced5ec..9ba5a35 100644
--- a/gentoopm/portagepm/pkg.py
+++ b/gentoopm/portagepm/pkg.py
@@ -74,6 +74,13 @@ class PortageUseSet(SpaceSepFrozenSet):
 		self._use = use
 		return SpaceSepFrozenSet.__new__(self, _get_iuse())
 
+	def __getitem__(self, k):
+		try:
+			return SpaceSepFrozenSet.__getitem__(self, k)
+		except KeyError:
+			# XXX, incorrect flags?
+			return PortageUseFlag(k, self._use)
+
 class PortageDBCPV(PMPackage, CompletePortageAtom):
 	def __init__(self, cpv, dbapi):
 		self._cpv = cpv