[gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/pm/

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

commit:     e8ce0f0dc51f8d83f268335b0552ed4d10409d13
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 20:27:27 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 20:27:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=e8ce0f0d

Don't pass PM instance to VDB, and don't require __init__.

---
 PMSTestSuite/pm/__init__.py  |   10 +---------
 PMSTestSuite/pm/portagepm.py |    2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/PMSTestSuite/pm/__init__.py b/PMSTestSuite/pm/__init__.py
index 7c3ef4d..b6066de 100644
--- a/PMSTestSuite/pm/__init__.py
+++ b/PMSTestSuite/pm/__init__.py
@@ -38,14 +38,6 @@ class PackageManager(object):
 		__metaclass__ = ABCMeta
 
 		@abstractmethod
-		def __init__(self, pm):
-			"""
-			Instantiate the VDB interface. Passed parent PackageManager
-			instance.
-			"""
-			pass
-
-		@abstractmethod
 		def __contains__(self, pkg):
 			"""
 			Check whether a particular package (CPV) was merged (and thus exists
@@ -54,7 +46,7 @@ class PackageManager(object):
 			pass
 
 	def __init__(self):
-		self.vdb = self.VDB(self)
+		self.vdb = self.VDB()
 
 	@abstractproperty
 	def name(self):

diff --git a/PMSTestSuite/pm/portagepm.py b/PMSTestSuite/pm/portagepm.py
index fee2c07..2765def 100644
--- a/PMSTestSuite/pm/portagepm.py
+++ b/PMSTestSuite/pm/portagepm.py
@@ -27,7 +27,7 @@ class PortagePM(PackageManager):
 		def __contains__(self, cpv):
 			return bool(self._vardb.cpv_exists(cpv))
 
-		def __init__(self, pm):
+		def __init__(self):
 			from portage import create_trees
 			trees = create_trees(
 					config_root = os.environ.get('PORTAGE_CONFIGROOT'),