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

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

commit:     eb76b8c4e201184e51e4cdf169b971e6cb3ddae4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 20:35:26 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 20:35:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=eb76b8c4

Portage: move _aux_get() wrapper directly to Portage{,DB}CPV.

---
 gentoopm/portagepm/pkg.py |   33 ++++++++++++---------------------
 1 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py
index b421596..e8bf6b5 100644
--- a/gentoopm/portagepm/pkg.py
+++ b/gentoopm/portagepm/pkg.py
@@ -47,7 +47,7 @@ class PortageDBCPV(PMPackage, CompletePortageAtom):
 
 	@property
 	def metadata(self):
-		return PortageDBMetadata(self._cpv, self._dbapi)
+		return PortageMetadata(self)
 
 	@property
 	def path(self):
@@ -62,6 +62,9 @@ class PortageDBCPV(PMPackage, CompletePortageAtom):
 	def version(self):
 		return PortagePackageVersion(self._cpv)
 
+	def _aux_get(self, *keys):
+		return self._dbapi.aux_get(self._cpv, keys)
+
 	@property
 	def description(self):
 		return PortagePackageDescription(self.metadata) # XXX
@@ -105,10 +108,6 @@ class PortageCPV(PortageDBCPV):
 		self._repo_prio = repo_prio
 
 	@property
-	def metadata(self):
-		return PortageMetadata(self._cpv, self._dbapi, self._tree)
-
-	@property
 	def path(self):
 		return StringWrapper(self._dbapi.findname(self._cpv, self._tree))
 
@@ -116,6 +115,10 @@ class PortageCPV(PortageDBCPV):
 	def repository(self):
 		return StringWrapper(self._dbapi.getRepositoryName(self._tree))
 
+	def _aux_get(self, *keys):
+		return self._dbapi.aux_get(self._cpv, keys,
+				mytree = self._tree)
+
 	def __str__(self):
 		return '=%s::%s' % (self._cpv, self.repository)
 
@@ -127,23 +130,11 @@ class PortageCPV(PortageDBCPV):
 				or vercmp(cpv_getversion(self._cpv), cpv_getversion(other._cpv)) < 0 \
 				or self._repo_prio < other._repo_prio
 
-class PortageDBMetadata(PMPackageMetadata):
-	def __init__(self, cpv, dbapi):
-		self._cpv = cpv
-		self._dbapi = dbapi
-
-	def __getattr__(self, key):
-		if key not in self:
-			raise AttributeError('Unsupported metadata key: %s' % key)
-		return self._dbapi.aux_get(self._cpv, [key])[0]
-
-class PortageMetadata(PortageDBMetadata):
-	def __init__(self, cpv, dbapi, tree):
-		PortageDBMetadata.__init__(self, cpv, dbapi)
-		self._tree = tree
+class PortageMetadata(PMPackageMetadata):
+	def __init__(self, pkg):
+		self._pkg = pkg
 
 	def __getattr__(self, key):
 		if key not in self:
 			raise AttributeError('Unsupported metadata key: %s' % key)
-		return self._dbapi.aux_get(self._cpv, [key],
-				mytree = self._tree)[0]
+		return self._pkg._aux_get(key)[0]