summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-06-22 18:12:37 +0000
committerZac Medico <zmedico@gentoo.org>2009-06-22 18:12:37 +0000
commit13d9a8d5f95575c814570cd4e5713541ed022f37 (patch)
treee2acfe69f36f2fd8e1d671df7c426d0ace94262c
parent2b2ffc1467d959e083b599d8f766e9b7af45ede5 (diff)
downloadportage-13d9a8d5f95575c814570cd4e5713541ed022f37.tar.gz
portage-13d9a8d5f95575c814570cd4e5713541ed022f37.tar.bz2
portage-13d9a8d5f95575c814570cd4e5713541ed022f37.zip
Revert lazy imports from r13665 for now, since pyflakes doesn't understand
them, and pyflakes helps check stuff while we're splitting this file up. svn path=/main/trunk/; revision=13666
-rw-r--r--pym/_emerge/__init__.py61
1 files changed, 27 insertions, 34 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 989b320f8..0a2bc6d2c 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -53,43 +53,36 @@ from portage.sets.base import InternalPackageSet
from itertools import chain, izip
-from portage.cache.cache_errors import CacheError
-
+from _emerge.SlotObject import SlotObject
+from _emerge.DepPriority import DepPriority
+from _emerge.BlockerDepPriority import BlockerDepPriority
+from _emerge.UnmergeDepPriority import UnmergeDepPriority
+from _emerge.DepPriorityNormalRange import DepPriorityNormalRange
+from _emerge.DepPrioritySatisfiedRange import DepPrioritySatisfiedRange
from _emerge.Task import Task
+from _emerge.Blocker import Blocker
+from _emerge.PollConstants import PollConstants
from _emerge.AsynchronousTask import AsynchronousTask
from _emerge.CompositeTask import CompositeTask
-
-import portage.proxy.lazyimport
-import portage.proxy as proxy
-proxy.lazyimport.lazyimport(globals(),
- '_emerge.SlotObject:SlotObject',
- '_emerge.DepPriority:DepPriority',
- '_emerge.BlockerDepPriority:BlockerDepPriority',
- '_emerge.UnmergeDepPriority:UnmergeDepPriority',
- '_emerge.DepPriorityNormalRange:DepPriorityNormalRange',
- '_emerge.DepPrioritySatisfiedRange:DepPrioritySatisfiedRange',
- '_emerge.Blocker:Blocker',
- '_emerge.PollConstants:PollConstants',
- '_emerge.EbuildFetcher:EbuildFetcher',
- '_emerge.EbuildBuild:EbuildBuild',
- '_emerge.EbuildMetadataPhase:EbuildMetadataPhase',
- '_emerge.EbuildPhase:EbuildPhase',
- '_emerge.Binpkg:Binpkg',
- '_emerge.BinpkgPrefetcher:BinpkgPrefetcher',
- '_emerge.PackageMerge:PackageMerge',
- '_emerge.DependencyArg:DependencyArg',
- '_emerge.AtomArg:AtomArg',
- '_emerge.PackageArg:PackageArg',
- '_emerge.SetArg:SetArg',
- '_emerge.Dependency:Dependency',
- '_emerge.BlockerCache:BlockerCache',
- '_emerge.PackageVirtualDbapi:PackageVirtualDbapi',
- '_emerge.RepoDisplay:RepoDisplay',
- '_emerge.UseFlagDisplay:UseFlagDisplay',
- '_emerge.PollSelectAdapter:PollSelectAdapter',
- '_emerge.SequentialTaskQueue:SequentialTaskQueue',
- '_emerge.ProgressHandler:ProgressHandler',
-)
+from _emerge.EbuildFetcher import EbuildFetcher
+from _emerge.EbuildBuild import EbuildBuild
+from _emerge.EbuildMetadataPhase import EbuildMetadataPhase
+from _emerge.EbuildPhase import EbuildPhase
+from _emerge.Binpkg import Binpkg
+from _emerge.BinpkgPrefetcher import BinpkgPrefetcher
+from _emerge.PackageMerge import PackageMerge
+from _emerge.DependencyArg import DependencyArg
+from _emerge.AtomArg import AtomArg
+from _emerge.PackageArg import PackageArg
+from _emerge.SetArg import SetArg
+from _emerge.Dependency import Dependency
+from _emerge.BlockerCache import BlockerCache
+from _emerge.PackageVirtualDbapi import PackageVirtualDbapi
+from _emerge.RepoDisplay import RepoDisplay
+from _emerge.UseFlagDisplay import UseFlagDisplay
+from _emerge.PollSelectAdapter import PollSelectAdapter
+from _emerge.SequentialTaskQueue import SequentialTaskQueue
+from _emerge.ProgressHandler import ProgressHandler
try:
from cStringIO import StringIO