diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-02 20:54:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 20:54:43 +0000 |
| commit | 5ebaf0da2313944d86e822d484d4099afc0d2d72 (patch) | |
| tree | 4a7a33ab872a386008eef465d567a849e0fa7cc2 /pym | |
| parent | 500d4f28f05b932654236acac9e87c34a3bfb94b (diff) | |
| download | portage-5ebaf0da2313944d86e822d484d4099afc0d2d72.tar.gz portage-5ebaf0da2313944d86e822d484d4099afc0d2d72.tar.bz2 portage-5ebaf0da2313944d86e822d484d4099afc0d2d72.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. (trunk r15420)
svn path=/main/branches/2.1.7/; revision=15642
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 06b06c4e2..35604c620 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] |