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

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

commit:     017172493ded87ad77cb197f3c65ec8d81db9485
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 09:07:27 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 09:18:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=01717249

Fix concatenating kwfilters, use itertools.

---
 gentoopm/basepm/filter.py |    5 ++---
 gentoopm/basepm/pkgset.py |    4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gentoopm/basepm/filter.py b/gentoopm/basepm/filter.py
index a43fad6..1d704b5 100644
--- a/gentoopm/basepm/filter.py
+++ b/gentoopm/basepm/filter.py
@@ -102,8 +102,7 @@ def transform_keyword_filters(kwargs):
 	@param kwargs: keyword arguments, as passed to L{PMPackageSet.filter()}
 	@type kwargs: dict
 	@return: positional arguments representing the keyword filters
-	@rtype: tuple
+	@rtype: iter(L{AttributeMatch})
 	"""
 
-	return tuple([PMTransformedKeywordFilter(k, v)
-			for k, v in kwargs.items()])
+	return itertools.starmap(PMTransformedKeywordFilter, kwargs.items())

diff --git a/gentoopm/basepm/pkgset.py b/gentoopm/basepm/pkgset.py
index bf8c66a..390cde9 100644
--- a/gentoopm/basepm/pkgset.py
+++ b/gentoopm/basepm/pkgset.py
@@ -3,6 +3,7 @@
 # (c) 2011 Michał Górny <mgorny@gentoo.org>
 # Released under the terms of the 2-clause BSD license.
 
+import itertools
 from abc import abstractmethod
 
 from .filter import transform_keyword_filters
@@ -173,7 +174,8 @@ class PMPackageSet(ABCObject, BoolCompat):
 class PMFilteredPackageSet(PMPackageSet):
 	def __init__(self, src, args, kwargs):
 		self._src = src
-		self._args = args + transform_keyword_filters(kwargs)
+		self._args = tuple(itertools.chain(args,
+				transform_keyword_filters(kwargs)))
 
 	def __iter__(self):
 		for el in self._src: