diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-05 13:14:07 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-05 13:14:07 -0700 |
| commit | 1a6c8a3c450fa8f4d8132c3d121272af7e256574 (patch) | |
| tree | 194c8b81b629ae3fcf3491f80e58dcc852fbc1ab | |
| parent | 3ea8bee8a4e69e55e5e33fe775ad08aa3d0f9c7a (diff) | |
| download | portage-1a6c8a3c450fa8f4d8132c3d121272af7e256574.tar.gz portage-1a6c8a3c450fa8f4d8132c3d121272af7e256574.tar.bz2 portage-1a6c8a3c450fa8f4d8132c3d121272af7e256574.zip | |
Eliminate portage.env from baseline imports.
| -rw-r--r-- | pym/portage/__init__.py | 1 | ||||
| -rw-r--r-- | pym/portage/dispatch_conf.py | 3 | ||||
| -rw-r--r-- | pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index e3b3cabfa..3c8d5ced6 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -81,7 +81,6 @@ try: 'match_from_list,match_to_list', 'portage.dep.dep_check:dep_check,dep_eval,dep_wordreduce,dep_zapdeps', 'portage.eclass_cache', - 'portage.env.loaders', 'portage.exception', 'portage.getbinpkg', 'portage.locks', diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py index c543afd33..e51e5cd13 100644 --- a/pym/portage/dispatch_conf.py +++ b/pym/portage/dispatch_conf.py @@ -15,6 +15,7 @@ except ImportError: from commands import getstatusoutput as subprocess_getstatusoutput import portage +from portage.env.loaders import KeyValuePairFileLoader from portage.localization import _ RCS_BRANCH = '1.1.1' @@ -41,7 +42,7 @@ def diffstatusoutput_len(cmd): return (1, 1) def read_config(mandatory_opts): - loader = portage.env.loaders.KeyValuePairFileLoader( + loader = KeyValuePairFileLoader( '/etc/dispatch-conf.conf', None) opts, errors = loader.load() if not opts: diff --git a/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py b/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py index f434573d0..3ccbb99cb 100644 --- a/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py +++ b/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py @@ -15,7 +15,7 @@ class LazyImportPortageBaselineTestCase(TestCase): _module_re = re.compile(r'^(portage|repoman|_emerge)\.') _baseline_imports = frozenset([ - 'portage.const', 'portage.env', 'portage.localization', + 'portage.const', 'portage.localization', 'portage.proxy', 'portage.proxy.lazyimport', 'portage.proxy.objectproxy', 'portage._ensure_encodings', ]) |