1. Michał Górny
  2. gentoopm


Michał Górny  committed 0171724

Fix concatenating kwfilters, use itertools.

  • Participants
  • Parent commits 2a1903d
  • Branches master

Comments (0)

Files changed (2)

File gentoopm/basepm/filter.py

View file
 	@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())

File gentoopm/basepm/pkgset.py

View file
 # (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
 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: