Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13665 - main/trunk/pym/_emerge
Date: Mon, 22 Jun 2009 17:28:22
Message-Id: E1MInJc-0003be-Id@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-06-22 17:28:19 +0000 (Mon, 22 Jun 2009)
3 New Revision: 13665
4
5 Modified:
6 main/trunk/pym/_emerge/__init__.py
7 Log:
8 Use lazy imports for submodules where possible.
9
10
11 Modified: main/trunk/pym/_emerge/__init__.py
12 ===================================================================
13 --- main/trunk/pym/_emerge/__init__.py 2009-06-22 17:03:37 UTC (rev 13664)
14 +++ main/trunk/pym/_emerge/__init__.py 2009-06-22 17:28:19 UTC (rev 13665)
15 @@ -53,37 +53,44 @@
16
17 from itertools import chain, izip
18
19 -from _emerge.SlotObject import SlotObject
20 -from _emerge.DepPriority import DepPriority
21 -from _emerge.BlockerDepPriority import BlockerDepPriority
22 -from _emerge.UnmergeDepPriority import UnmergeDepPriority
23 -from _emerge.DepPriorityNormalRange import DepPriorityNormalRange
24 -from _emerge.DepPrioritySatisfiedRange import DepPrioritySatisfiedRange
25 +from portage.cache.cache_errors import CacheError
26 +
27 from _emerge.Task import Task
28 -from _emerge.Blocker import Blocker
29 -from _emerge.PollConstants import PollConstants
30 from _emerge.AsynchronousTask import AsynchronousTask
31 from _emerge.CompositeTask import CompositeTask
32 -from _emerge.EbuildFetcher import EbuildFetcher
33 -from _emerge.EbuildBuild import EbuildBuild
34 -from _emerge.EbuildMetadataPhase import EbuildMetadataPhase
35 -from _emerge.EbuildPhase import EbuildPhase
36 -from _emerge.Binpkg import Binpkg
37 -from _emerge.BinpkgPrefetcher import BinpkgPrefetcher
38 -from _emerge.PackageMerge import PackageMerge
39 -from _emerge.DependencyArg import DependencyArg
40 -from _emerge.AtomArg import AtomArg
41 -from _emerge.PackageArg import PackageArg
42 -from _emerge.SetArg import SetArg
43 -from _emerge.Dependency import Dependency
44 -from _emerge.BlockerCache import BlockerCache
45 -from _emerge.PackageVirtualDbapi import PackageVirtualDbapi
46 -from _emerge.RepoDisplay import RepoDisplay
47 -from _emerge.UseFlagDisplay import UseFlagDisplay
48 -from _emerge.PollSelectAdapter import PollSelectAdapter
49 -from _emerge.SequentialTaskQueue import SequentialTaskQueue
50 -from _emerge.ProgressHandler import ProgressHandler
51
52 +import portage.proxy.lazyimport
53 +import portage.proxy as proxy
54 +proxy.lazyimport.lazyimport(globals(),
55 + '_emerge.SlotObject:SlotObject',
56 + '_emerge.DepPriority:DepPriority',
57 + '_emerge.BlockerDepPriority:BlockerDepPriority',
58 + '_emerge.UnmergeDepPriority:UnmergeDepPriority',
59 + '_emerge.DepPriorityNormalRange:DepPriorityNormalRange',
60 + '_emerge.DepPrioritySatisfiedRange:DepPrioritySatisfiedRange',
61 + '_emerge.Blocker:Blocker',
62 + '_emerge.PollConstants:PollConstants',
63 + '_emerge.EbuildFetcher:EbuildFetcher',
64 + '_emerge.EbuildBuild:EbuildBuild',
65 + '_emerge.EbuildMetadataPhase:EbuildMetadataPhase',
66 + '_emerge.EbuildPhase:EbuildPhase',
67 + '_emerge.Binpkg:Binpkg',
68 + '_emerge.BinpkgPrefetcher:BinpkgPrefetcher',
69 + '_emerge.PackageMerge:PackageMerge',
70 + '_emerge.DependencyArg:DependencyArg',
71 + '_emerge.AtomArg:AtomArg',
72 + '_emerge.PackageArg:PackageArg',
73 + '_emerge.SetArg:SetArg',
74 + '_emerge.Dependency:Dependency',
75 + '_emerge.BlockerCache:BlockerCache',
76 + '_emerge.PackageVirtualDbapi:PackageVirtualDbapi',
77 + '_emerge.RepoDisplay:RepoDisplay',
78 + '_emerge.UseFlagDisplay:UseFlagDisplay',
79 + '_emerge.PollSelectAdapter:PollSelectAdapter',
80 + '_emerge.SequentialTaskQueue:SequentialTaskQueue',
81 + '_emerge.ProgressHandler:ProgressHandler',
82 +)
83 +
84 try:
85 from cStringIO import StringIO
86 except ImportError: