[gentoo-commits] proj/gentoopm:master commit in: gentoopm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     f1c01cc80d50428705f09bb238ceb6c006a889dc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 18:44:46 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 18:45:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=f1c01cc8

Support passing multiple values to Contains().

---
 gentoopm/matchers.py |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/gentoopm/matchers.py b/gentoopm/matchers.py
index 52a005f..c0efe71 100644
--- a/gentoopm/matchers.py
+++ b/gentoopm/matchers.py
@@ -31,14 +31,31 @@ class Contains(PMKeywordMatcher):
 	A keyword attribute matcher checking for list membership.
 	"""
 
-	def __init__(self, elem):
-		self._elem = elem
+	def __init__(self, *elems):
+		"""
+		Instantiate the matcher for arguments. If multiple arguments are passed
+		in, at least one of them must be contained in the value.
+
+		@param elems: elements to match against the value contents
+		@type elems: any
+		"""
+
+		self._simple_matchers = set()
+		self._complex_matchers = []
+		for e in elems:
+			if isinstance(e, str):
+				self._simple_matchers.add(e)
+			else:
+				self._complex_matchers.append(e)
 
 	def __eq__(self, val):
-		if isinstance(self._elem, str):
-			return self._elem in val
-		else:
+		for n in self._simple_matchers:
+			if n in val:
+				return True
+
+		for n in self._complex_matchers:
 			for e in val:
-				if self._elem == e:
+				if n == e:
 					return True
-			return False
+
+		return False