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

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

commit:     d3cc5230a4a8b3bf4a5cbf05630cdea1de50fecc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 20:39:27 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 20:39:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=d3cc5230

Use hardcoded list to generate AttributeMatches from kwargs.

---
 gentoopm/basepm/filter.py |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/gentoopm/basepm/filter.py b/gentoopm/basepm/filter.py
index 0851d84..a43fad6 100644
--- a/gentoopm/basepm/filter.py
+++ b/gentoopm/basepm/filter.py
@@ -81,14 +81,19 @@ class SmartAttrGetter(object):
 			raise KeyError('Invalid keyword argument: %s' % self._k)
 
 class PMTransformedKeywordFilter(PMPackageMatcher):
-	# XXX: transform this to subclass of ..filters.AttributeMatch
-	# hardcode 'foo_bar' -> 'foo.bar' mappings instead of doing magic
-	def __init__(self, key, val):
-		self._getter = SmartAttrGetter(key)
-		self._val = val
-
-	def __call__(self, pkg):
-		return self._val == self._getter(pkg)
+	_map = {
+		'key_category': 'key.category',
+		'key_package': 'key.package',
+		'key_state': 'key.state',
+		'description_short': 'description.short',
+		'description_long': 'description.long'
+	}
+
+	def __new__(self, key, val):
+		from ..filters import AttributeMatch
+		if key in self._map:
+			key = self._map[key]
+		return AttributeMatch(key, val)
 
 def transform_keyword_filters(kwargs):
 	"""