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 1QryUx-0001eA-F4 for garchives@archives.gentoo.org; Fri, 12 Aug 2011 20:38:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40FF921C11E; Fri, 12 Aug 2011 20:38:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1414321C11E for ; Fri, 12 Aug 2011 20:38:21 +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 774351B4023 for ; Fri, 12 Aug 2011 20:38:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EAB5F80040 for ; Fri, 12 Aug 2011 20:38:20 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/basepm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/basepm/filter.py X-VCS-Directories: gentoopm/basepm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d3cc5230a4a8b3bf4a5cbf05630cdea1de50fecc Date: Fri, 12 Aug 2011 20:38:20 +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: a928c5cdecf6ba98aa5ef572e28ee3a9 commit: d3cc5230a4a8b3bf4a5cbf05630cdea1de50fecc Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Aug 12 20:39:27 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Aug 12 20:39:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3Dd3cc5230 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) =20 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 =3D SmartAttrGetter(key) - self._val =3D val - - def __call__(self, pkg): - return self._val =3D=3D self._getter(pkg) + _map =3D { + '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 =3D self._map[key] + return AttributeMatch(key, val) =20 def transform_keyword_filters(kwargs): """