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

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

commit:     dc6dbc7c57f9ce4f3bed0b88b17d59521ec98043
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 22:13:10 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 22:17:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=dc6dbc7c

pkgcore: transform strings to atoms in filter().

---
 gentoopm/pkgcorepm/filter.py |    2 ++
 gentoopm/pkgcorepm/pkg.py    |   13 ++++++++++++-
 gentoopm/pkgcorepm/repo.py   |    9 +++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/gentoopm/pkgcorepm/filter.py b/gentoopm/pkgcorepm/filter.py
index 6201637..d7218b7 100644
--- a/gentoopm/pkgcorepm/filter.py
+++ b/gentoopm/pkgcorepm/filter.py
@@ -21,6 +21,8 @@ def transform_filters(args, kwargs):
 	f = []
 
 	for a in args:
+		if isinstance(a, basestring):
+			a = PkgCoreAtom(a)
 		if isinstance(a, PkgCoreAtom):
 			f.append(a._r)
 		else:

diff --git a/gentoopm/pkgcorepm/pkg.py b/gentoopm/pkgcorepm/pkg.py
index 220473f..8e344d0 100644
--- a/gentoopm/pkgcorepm/pkg.py
+++ b/gentoopm/pkgcorepm/pkg.py
@@ -4,7 +4,18 @@
 # Released under the terms of the 2-clause BSD license.
 
 from gentoopm.basepm.metadata import PMPackageMetadata
-from gentoopm.basepm.pkg import PMPackage
+from gentoopm.basepm.pkg import PMPackage, PMPackageSet, PMFilteredPackageSet
+from gentoopm.pkgcorepm.atom import PkgCoreAtom
+
+class PkgCorePackageSet(PMPackageSet):
+	def filter(self, *args, **kwargs):
+		newargs = [(a if not isinstance(a, basestring)
+			else PkgCoreAtom(a)) for a in args]
+
+		return PkgCoreFilteredPackageSet(self, newargs, kwargs)
+
+class PkgCoreFilteredPackageSet(PkgCorePackageSet, PMFilteredPackageSet):
+	pass
 
 class PkgCorePackage(PMPackage):
 	def __init__(self, pkg, repo_index = 0):

diff --git a/gentoopm/pkgcorepm/repo.py b/gentoopm/pkgcorepm/repo.py
index cd25359..c76d3c6 100644
--- a/gentoopm/pkgcorepm/repo.py
+++ b/gentoopm/pkgcorepm/repo.py
@@ -7,7 +7,8 @@ import pkgcore.restrictions.boolean as br
 
 from gentoopm.basepm.repo import PMRepository, PMRepositoryDict, \
 		PMEbuildRepository
-from gentoopm.pkgcorepm.pkg import PkgCorePackage
+from gentoopm.pkgcorepm.pkg import PkgCorePackage, PkgCorePackageSet, \
+		PkgCoreFilteredPackageSet
 from gentoopm.pkgcorepm.filter import transform_filters
 
 class PkgCoreRepoDict(PMRepositoryDict):
@@ -18,7 +19,7 @@ class PkgCoreRepoDict(PMRepositoryDict):
 	def __init__(self, stack):
 		self._stack = stack
 
-class PkgCoreRepository(PMRepository):
+class PkgCoreRepository(PkgCorePackageSet, PMRepository):
 	_index = 0
 	def __init__(self, repo_obj):
 		self._repo = repo_obj
@@ -35,7 +36,7 @@ class PkgCoreRepository(PMRepository):
 		if filt:
 			r = PkgCoreFilteredRepo(self, filt)
 		if newargs or newkwargs:
-			r = PMRepository.filter(r, *args, **kwargs)
+			r = PkgCoreFilteredPackageSet(r, args, kwargs)
 
 		return r
 
@@ -58,7 +59,7 @@ class PkgCoreFilteredRepo(PkgCoreRepository):
 			r = PkgCoreFilteredRepo(self._repo,
 					br.AndRestriction(self._filt, filt))
 		if newargs or newkwargs:
-			r = PMRepository.filter(r, *args, **kwargs)
+			r = PkgCoreFilteredPackageSet(r, args, kwargs)
 
 		return r