summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-02-25 22:02:52 +0000
committerZac Medico <zmedico@gentoo.org>2010-02-25 22:02:52 +0000
commitb1bc43d803ad1cb56b61c2daa0c132f56c6a42f2 (patch)
tree6e930e97237692f7dc0c6d5c8cb8f31525be0415
parent1913033e17181b34044d482a41bcef69e94c50aa (diff)
downloadportage-b1bc43d803ad1cb56b61c2daa0c132f56c6a42f2.tar.gz
portage-b1bc43d803ad1cb56b61c2daa0c132f56c6a42f2.tar.bz2
portage-b1bc43d803ad1cb56b61c2daa0c132f56c6a42f2.zip
Avoid name collision with dep_expand submodule so epydoc won't crash.
svn path=/main/trunk/; revision=15465
-rw-r--r--pym/portage/dbapi/__init__.py4
1 files 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)))