Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15465 - main/trunk/pym/portage/dbapi
Date: Thu, 25 Feb 2010 22:02:57
Message-Id: E1NklnI-0007Fy-SW@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-02-25 22:02:52 +0000 (Thu, 25 Feb 2010)
3 New Revision: 15465
4
5 Modified:
6 main/trunk/pym/portage/dbapi/__init__.py
7 Log:
8 Avoid name collision with dep_expand submodule so epydoc won't crash.
9
10
11 Modified: main/trunk/pym/portage/dbapi/__init__.py
12 ===================================================================
13 --- main/trunk/pym/portage/dbapi/__init__.py 2010-02-25 21:52:38 UTC (rev 15464)
14 +++ main/trunk/pym/portage/dbapi/__init__.py 2010-02-25 22:02:52 UTC (rev 15465)
15 @@ -8,7 +8,7 @@
16
17 import portage
18 portage.proxy.lazyimport.lazyimport(globals(),
19 - 'portage.dbapi.dep_expand:dep_expand',
20 + 'portage.dbapi.dep_expand:_dep_expand',
21 'portage.dep:match_from_list',
22 'portage.locks:unlockfile',
23 'portage.output:colorize',
24 @@ -122,7 +122,7 @@
25 Returns:
26 a list of packages that match origdep
27 """
28 - mydep = dep_expand(origdep, mydb=self, settings=self.settings)
29 + mydep = _dep_expand(origdep, mydb=self, settings=self.settings)
30 return list(self._iter_match(mydep,
31 self.cp_list(mydep.cp, use_cache=use_cache)))