diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-02-22 01:49:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-02-22 01:49:55 +0000 |
| commit | 4808904f25235d931df6ed4b9093d1ad9395bb6a (patch) | |
| tree | e3734df1abe681e45e533d8c16b4776a59e371eb | |
| parent | a85d10088212250a74b2ff1c2b083897d4b3623c (diff) | |
| download | portage-4808904f25235d931df6ed4b9093d1ad9395bb6a.tar.gz portage-4808904f25235d931df6ed4b9093d1ad9395bb6a.tar.bz2 portage-4808904f25235d931df6ed4b9093d1ad9395bb6a.zip | |
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
| -rw-r--r-- | pym/portage/__init__.py | 5 | ||||
| -rw-r--r-- | pym/portage/glsa.py | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 694062a62..7b37cb962 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -83,7 +83,7 @@ try: 'portage.data', 'portage.data:lchown,ostype,portage_gid,portage_uid,secpass,' + \ 'uid,userland,userpriv_groups,wheelgid', - 'portage.dbapi:dbapi', + 'portage.dbapi', 'portage.dbapi.bintree:bindbapi,binarytree', 'portage.dbapi.porttree:close_portdbapi_caches,FetchlistDict,' + \ 'portagetree,portdbapi', @@ -2102,9 +2102,10 @@ class config(object): #getting categories from an external file now categories = [grabfile(os.path.join(x, "categories")) for x in locations] + category_re = dbapi.dbapi._category_re self.categories = tuple(sorted( x for x in stack_lists(categories, incremental=1) - if dbapi._category_re.match(x) is not None)) + if category_re.match(x) is not None)) del categories archlist = [grabfile(os.path.join(x, "arch.list")) for x in locations] 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 |