[gentoo-commits] proj/portage:prefix commit in: pym/portage/tests/lazyimport/, pym/portage/

[Fabian Groffen]

commit:     e7dd20e04cac68ef2947108150fd4ae159851cf5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 19:15:42 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu May 24 19:15:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e7dd20e0

reduce differences with master

 pym/portage/__init__.py                                           | 2 ++
 pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 95c6dff15..f9cc1a87c 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -420,6 +420,7 @@ def _shell_quote(s):
 bsd_chflags = None
 
 if platform.system() in ('FreeBSD',):
+       # TODO: remove this class?
        class bsd_chflags(object):
                chflags = os.chflags
                lchflags = os.lchflags
@@ -536,6 +537,7 @@ def create_trees(config_root=None, target_root=None, 
trees=None, env=None,
 
        if env is None:
                env = os.environ
+
        settings = config(config_root=config_root, target_root=target_root,
                env=env, sysroot=sysroot, eprefix=eprefix)
        settings.lock()

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 d24d8dcc0..2bc54698a 100644
--- a/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py
+++ b/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py
@@ -16,11 +16,11 @@ class LazyImportPortageBaselineTestCase(TestCase):
        _module_re = re.compile(r'^(portage|repoman|_emerge)\.')
 
        _baseline_imports = frozenset([
-               'portage.const', 'portage.const_autotool',
-               'portage.localization',
+               'portage.const', 'portage.localization',
                'portage.proxy', 'portage.proxy.lazyimport',
                'portage.proxy.objectproxy',
                'portage._selinux',
+               'portage.const_autotool',
        ])
 
        _baseline_import_cmd = [portage._python_interpreter, '-c', '''