diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-12-11 03:22:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-11 03:22:40 +0000 |
| commit | 0765de4d004df42a3ebec40b10b1d88155e31911 (patch) | |
| tree | f1dea5b49b44ad2401bd6befb3b42b402124871e | |
| parent | Use collections.OrderedDict when available (python-2.7) and fall back to (diff) | |
| download | portage-idfetch-0765de4d004df42a3ebec40b10b1d88155e31911.tar.gz portage-idfetch-0765de4d004df42a3ebec40b10b1d88155e31911.tar.bz2 portage-idfetch-0765de4d004df42a3ebec40b10b1d88155e31911.zip | |
Don't use lazy import for portage.cache.mappings because it's imported anyway.
svn path=/main/trunk/; revision=15029
| -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 3819bfd3..e9c301ed 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 |