From 4808904f25235d931df6ed4b9093d1ad9395bb6a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 22 Feb 2010 01:49:55 +0000 Subject: Don't import the portage.dbapi.dbapi class as portage.dbapi anymore, since it results in a strange namespace collision (portage.dbapi is both a class and a module). Hopefully this won't break any api consumers since it's a pure virtual class anyway. svn path=/main/trunk/; revision=15420 --- pym/portage/glsa.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pym/portage/glsa.py') diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py index 98602e4cc..38b07ad32 100644 --- a/pym/portage/glsa.py +++ b/pym/portage/glsa.py @@ -268,12 +268,12 @@ def makeVersion(versionNode): def match(atom, dbapi, match_type="default"): """ - wrapper that calls revisionMatch() or portage.dbapi.match() depending on + wrapper that calls revisionMatch() or portage.dbapi.dbapi.match() depending on the given atom. @type atom: string @param atom: a <~ or >~ atom or a normal portage atom that contains the atom to match against - @type dbapi: portage.dbapi + @type dbapi: portage.dbapi.dbapi @param dbapi: one of the portage databases to use as information source @type match_type: string @param match_type: if != "default" passed as first argument to dbapi.xmatch @@ -297,7 +297,7 @@ def revisionMatch(revisionAtom, dbapi, match_type="default"): @type revisionAtom: string @param revisionAtom: a <~ or >~ atom that contains the atom to match against - @type dbapi: portage.dbapi + @type dbapi: portage.dbapi.dbapi @param dbapi: one of the portage databases to use as information source @type match_type: string @param match_type: if != "default" passed as first argument to portdb.xmatch -- cgit v1.2.3-1-g7c22