From a7bb5067fd7c9d971ebcb909ccb6076040d872b7 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 2 Mar 2010 21:01:41 +0000 Subject: [PATCH] Avoid name collision with dep_expand submodule so epydoc won't crash. (trunk r15465) svn path=/main/branches/2.1.7/; revision=15674 --- pym/portage/dbapi/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py index dcd933f62..54d3877b2 100644 --- a/pym/portage/dbapi/__init__.py +++ b/pym/portage/dbapi/__init__.py @@ -8,7 +8,7 @@ import re import portage portage.proxy.lazyimport.lazyimport(globals(), - 'portage.dbapi.dep_expand:dep_expand', + 'portage.dbapi.dep_expand:_dep_expand', 'portage.dep:match_from_list', 'portage.locks:unlockfile', 'portage.output:colorize', @@ -122,7 +122,7 @@ class dbapi(object): Returns: a list of packages that match origdep """ - mydep = dep_expand(origdep, mydb=self, settings=self.settings) + mydep = _dep_expand(origdep, mydb=self, settings=self.settings) return list(self._iter_match(mydep, self.cp_list(mydep.cp, use_cache=use_cache))) -- 2.26.2