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

[Michał Górny]

commit:     1289b60a321e7b0fa507ee22e9a92d4baef2234c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 15:59:59 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 15:59:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=1289b60a

Portage: cleanup class inheritance.

---
 gentoopm/portagepm/__init__.py |    3 +-
 gentoopm/portagepm/db.py       |   65 ----------------------------------------
 gentoopm/portagepm/pkg.py      |   36 ++++++++++++++++++----
 gentoopm/portagepm/repo.py     |   15 ++++++++-
 4 files changed, 43 insertions(+), 76 deletions(-)

diff --git a/gentoopm/portagepm/__init__.py b/gentoopm/portagepm/__init__.py
index 15a9bec..0919916 100644
--- a/gentoopm/portagepm/__init__.py
+++ b/gentoopm/portagepm/__init__.py
@@ -7,8 +7,7 @@ import os
 from portage import create_trees
 
 from gentoopm.basepm import PackageManager
-from gentoopm.portagepm.repo import PortageRepoDict
-from gentoopm.portagepm.db import VDBRepository
+from gentoopm.portagepm.repo import PortageRepoDict, VDBRepository
 
 class PortagePM(PackageManager):
 	name = 'portage'

diff --git a/gentoopm/portagepm/db.py b/gentoopm/portagepm/db.py
deleted file mode 100644
index 3eae39a..0000000
--- a/gentoopm/portagepm/db.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/python
-#	vim:fileencoding=utf-8
-# (c) 2011 Michał Górny <mgorny@g.o>
-# Released under the terms of the 2-clause BSD license.
-
-import portage.versions
-
-from gentoopm.basepm.metadata import PMPackageMetadata
-from gentoopm.basepm.repo import PMRepository
-from gentoopm.portagepm.pkg import PortageCPV
-
-# XXX: cleanup all this mess!
-
-class PortageDBCPV(PortageCPV):
-	def __init__(self, cpv, dbapi):
-		self._cpv = cpv
-		self._dbapi = dbapi
-
-	@property
-	def metadata(self):
-		return PortageDBMetadata(self._cpv, self._dbapi)
-
-	@property
-	def path(self):
-		# .findname() gives .ebuild path
-		return self._dbapi.getpath(self._cpv)
-
-class PortageDBMetadata(PMPackageMetadata):
-	def __init__(self, cpv, dbapi):
-		self._cpv = cpv
-		self._dbapi = dbapi
-
-	def __getattr__(self, key):
-		return self._dbapi.aux_get(self._cpv, [key])[0]
-
-	@property
-	def CATEGORY(self):
-		return portage.versions.catsplit(self._cpv)[0]
-
-	@property
-	def PN(self):
-		return portage.versions.catpkgsplit(self._cpv)[1]
-
-	@property
-	def PV(self):
-		return portage.versions.pkgsplit(self._cpv)[1]
-
-	@property
-	def PR(self):
-		return portage.versions.pkgsplit(self._cpv)[2]
-
-	@property
-	def PVR(self):
-		return portage.versions.cpv_getversion(self._cpv)
-
-class PortDBRepository(PMRepository):
-	def __init__(self, dbapi):
-		self._dbapi = dbapi
-
-	def __iter__(self):
-		for p in self._dbapi.cpv_all(): # XXX
-			yield PortageDBCPV(p, self._dbapi)
-
-class VDBRepository(PortDBRepository):
-	pass

diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py
index 8696706..a92af4e 100644
--- a/gentoopm/portagepm/pkg.py
+++ b/gentoopm/portagepm/pkg.py
@@ -10,10 +10,23 @@ from gentoopm.basepm.pkg import PMPackage
 
 # XXX: cleanup all this mess!
 
-class PortageCPV(PMPackage):
-	def __init__(self, cpv, dbapi, tree):
+class PortageDBCPV(PMPackage):
+	def __init__(self, cpv, dbapi):
 		self._cpv = cpv
 		self._dbapi = dbapi
+
+	@property
+	def metadata(self):
+		return PortageDBMetadata(self._cpv, self._dbapi)
+
+	@property
+	def path(self):
+		# .findname() gives .ebuild path
+		return self._dbapi.getpath(self._cpv)
+
+class PortageCPV(PortageDBCPV):
+	def __init__(self, cpv, dbapi, tree = None):
+		PortageDBCPV.__init__(self, cpv, dbapi)
 		self._tree = tree
 
 	@property
@@ -35,17 +48,15 @@ class PortageCPV(PMPackage):
 				portage.versions.cpv_getversion(self._cpv),
 				portage.versions.cpv_getversion(other._cpv))
 
-class PortageMetadata(PMPackageMetadata):
-	def __init__(self, cpv, dbapi, tree):
+class PortageDBMetadata(PMPackageMetadata):
+	def __init__(self, cpv, dbapi):
 		self._cpv = cpv
 		self._dbapi = dbapi
-		self._tree = tree
 
 	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._dbapi.aux_get(self._cpv, [key])[0]
 
 	@property
 	def CATEGORY(self):
@@ -66,3 +77,14 @@ class PortageMetadata(PMPackageMetadata):
 	@property
 	def PVR(self):
 		return portage.versions.cpv_getversion(self._cpv)
+
+class PortageMetadata(PortageDBMetadata):
+	def __init__(self, cpv, dbapi, tree):
+		PortageDBMetadata.__init__(self, cpv, dbapi)
+		self._tree = tree
+
+	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]

diff --git a/gentoopm/portagepm/repo.py b/gentoopm/portagepm/repo.py
index 8203f92..aece5f6 100644
--- a/gentoopm/portagepm/repo.py
+++ b/gentoopm/portagepm/repo.py
@@ -5,8 +5,8 @@
 
 import os.path
 
-from gentoopm.basepm.repo import PMRepositoryDict, PMEbuildRepository
-from gentoopm.portagepm.db import PortDBRepository
+from gentoopm.basepm.repo import PMRepositoryDict, PMEbuildRepository, \
+		PMRepository
 from gentoopm.portagepm.pkg import PortageCPV
 
 class PortageRepoDict(PMRepositoryDict):
@@ -29,6 +29,14 @@ class PortageRepoDict(PMRepositoryDict):
 	def __init__(self, portdbapi):
 		self._dbapi = portdbapi
 
+class PortDBRepository(PMRepository):
+	def __init__(self, dbapi):
+		self._dbapi = dbapi
+
+	def __iter__(self):
+		for p in self._dbapi.cpv_all(): # XXX
+			yield PortageCPV(p, self._dbapi)
+
 class PortageRepository(PortDBRepository, PMEbuildRepository):
 	def __init__(self, repo_obj, portdbapi):
 		self._repo = repo_obj
@@ -50,3 +58,6 @@ class PortageRepository(PortDBRepository, PMEbuildRepository):
 
 	def __cmp__(self, other):
 		return cmp(self._repo.priority, other._repo.priority)
+
+class VDBRepository(PortDBRepository):
+	pass