diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:49:17 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:49:17 +0000 |
| commit | a189a31d3d7f9ed02529f6a16212445e05ac8ed0 (patch) | |
| tree | b519e3f1eda4e9c00e00944f6f7ddd3f8d1d9a53 | |
| parent | e4a903fe8235b14977dfc451492eb70407b94f0b (diff) | |
| download | portage-a189a31d3d7f9ed02529f6a16212445e05ac8ed0.tar.gz portage-a189a31d3d7f9ed02529f6a16212445e05ac8ed0.tar.bz2 portage-a189a31d3d7f9ed02529f6a16212445e05ac8ed0.zip | |
Don't use lazy import for portage.cache.mappings because it's imported anyway.
(trunk r15029)
svn path=/main/branches/2.1.7/; revision=15063
| -rw-r--r-- | pym/portage/__init__.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 0a6731bb2..b4484f5f1 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -67,11 +67,16 @@ except ImportError as e: raise try: + + try: + from collections import OrderedDict + except ImportError: + from portage.cache.mappings import OrderedDict + from portage.cache.cache_errors import CacheError import portage.proxy.lazyimport import portage.proxy as proxy proxy.lazyimport.lazyimport(globals(), - 'portage.cache.mappings:OrderedDict', 'portage.checksum', 'portage.checksum:perform_checksum,perform_md5,prelink_capable', 'portage.cvstree', @@ -133,13 +138,6 @@ except ImportError as e: sys.stderr.write(" "+str(e)+"\n\n") raise -try: - from collections import OrderedDict -except ImportError: - # lazy import is above - # from portage.cache.mappings import OrderedDict - pass - if sys.hexversion >= 0x3000000: basestring = str long = int |