| 1 |
Author: zmedico |
| 2 |
Date: 2009-06-22 18:12:37 +0000 (Mon, 22 Jun 2009) |
| 3 |
New Revision: 13666 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Revert lazy imports from r13665 for now, since pyflakes doesn't understand |
| 9 |
them, and pyflakes helps check stuff while we're splitting this file up. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2009-06-22 17:28:19 UTC (rev 13665) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2009-06-22 18:12:37 UTC (rev 13666) |
| 16 |
@@ -53,44 +53,37 @@ |
| 17 |
|
| 18 |
from itertools import chain, izip |
| 19 |
|
| 20 |
-from portage.cache.cache_errors import CacheError |
| 21 |
- |
| 22 |
+from _emerge.SlotObject import SlotObject |
| 23 |
+from _emerge.DepPriority import DepPriority |
| 24 |
+from _emerge.BlockerDepPriority import BlockerDepPriority |
| 25 |
+from _emerge.UnmergeDepPriority import UnmergeDepPriority |
| 26 |
+from _emerge.DepPriorityNormalRange import DepPriorityNormalRange |
| 27 |
+from _emerge.DepPrioritySatisfiedRange import DepPrioritySatisfiedRange |
| 28 |
from _emerge.Task import Task |
| 29 |
+from _emerge.Blocker import Blocker |
| 30 |
+from _emerge.PollConstants import PollConstants |
| 31 |
from _emerge.AsynchronousTask import AsynchronousTask |
| 32 |
from _emerge.CompositeTask import CompositeTask |
| 33 |
+from _emerge.EbuildFetcher import EbuildFetcher |
| 34 |
+from _emerge.EbuildBuild import EbuildBuild |
| 35 |
+from _emerge.EbuildMetadataPhase import EbuildMetadataPhase |
| 36 |
+from _emerge.EbuildPhase import EbuildPhase |
| 37 |
+from _emerge.Binpkg import Binpkg |
| 38 |
+from _emerge.BinpkgPrefetcher import BinpkgPrefetcher |
| 39 |
+from _emerge.PackageMerge import PackageMerge |
| 40 |
+from _emerge.DependencyArg import DependencyArg |
| 41 |
+from _emerge.AtomArg import AtomArg |
| 42 |
+from _emerge.PackageArg import PackageArg |
| 43 |
+from _emerge.SetArg import SetArg |
| 44 |
+from _emerge.Dependency import Dependency |
| 45 |
+from _emerge.BlockerCache import BlockerCache |
| 46 |
+from _emerge.PackageVirtualDbapi import PackageVirtualDbapi |
| 47 |
+from _emerge.RepoDisplay import RepoDisplay |
| 48 |
+from _emerge.UseFlagDisplay import UseFlagDisplay |
| 49 |
+from _emerge.PollSelectAdapter import PollSelectAdapter |
| 50 |
+from _emerge.SequentialTaskQueue import SequentialTaskQueue |
| 51 |
+from _emerge.ProgressHandler import ProgressHandler |
| 52 |
|
| 53 |
-import portage.proxy.lazyimport |
| 54 |
-import portage.proxy as proxy |
| 55 |
-proxy.lazyimport.lazyimport(globals(), |
| 56 |
- '_emerge.SlotObject:SlotObject', |
| 57 |
- '_emerge.DepPriority:DepPriority', |
| 58 |
- '_emerge.BlockerDepPriority:BlockerDepPriority', |
| 59 |
- '_emerge.UnmergeDepPriority:UnmergeDepPriority', |
| 60 |
- '_emerge.DepPriorityNormalRange:DepPriorityNormalRange', |
| 61 |
- '_emerge.DepPrioritySatisfiedRange:DepPrioritySatisfiedRange', |
| 62 |
- '_emerge.Blocker:Blocker', |
| 63 |
- '_emerge.PollConstants:PollConstants', |
| 64 |
- '_emerge.EbuildFetcher:EbuildFetcher', |
| 65 |
- '_emerge.EbuildBuild:EbuildBuild', |
| 66 |
- '_emerge.EbuildMetadataPhase:EbuildMetadataPhase', |
| 67 |
- '_emerge.EbuildPhase:EbuildPhase', |
| 68 |
- '_emerge.Binpkg:Binpkg', |
| 69 |
- '_emerge.BinpkgPrefetcher:BinpkgPrefetcher', |
| 70 |
- '_emerge.PackageMerge:PackageMerge', |
| 71 |
- '_emerge.DependencyArg:DependencyArg', |
| 72 |
- '_emerge.AtomArg:AtomArg', |
| 73 |
- '_emerge.PackageArg:PackageArg', |
| 74 |
- '_emerge.SetArg:SetArg', |
| 75 |
- '_emerge.Dependency:Dependency', |
| 76 |
- '_emerge.BlockerCache:BlockerCache', |
| 77 |
- '_emerge.PackageVirtualDbapi:PackageVirtualDbapi', |
| 78 |
- '_emerge.RepoDisplay:RepoDisplay', |
| 79 |
- '_emerge.UseFlagDisplay:UseFlagDisplay', |
| 80 |
- '_emerge.PollSelectAdapter:PollSelectAdapter', |
| 81 |
- '_emerge.SequentialTaskQueue:SequentialTaskQueue', |
| 82 |
- '_emerge.ProgressHandler:ProgressHandler', |
| 83 |
-) |
| 84 |
- |
| 85 |
try: |
| 86 |
from cStringIO import StringIO |
| 87 |
except ImportError: |
Archives