diff --git a/bob/extension/config.py b/bob/extension/config.py index bc4905cb7b0a889270251f91c4ada7d1d4fe0a8a..263846e24b584e55ec7061d5827c7320c6f60cf3 100644 --- a/bob/extension/config.py +++ b/bob/extension/config.py @@ -178,8 +178,10 @@ def load(paths, context=None, entry_point_group=None): for k,n in zip(paths, names): logger.debug("Loading configuration file `%s'...", k) mod = imp.new_module(n) + # remove the keys that might break the loading of the next config file. + ctxt.__dict__.pop('__name__', None) + ctxt.__dict__.pop('__package__', None) mod.__dict__.update(ctxt.__dict__) - mod.__name__ = n #reverse module-name override LOADED_CONFIGS.append(mod) ctxt = _load_context(k, mod) diff --git a/bob/extension/data/subpackage/__init__.py b/bob/extension/data/subpackage/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/bob/extension/data/subpackage/config.py b/bob/extension/data/subpackage/config.py new file mode 100644 index 0000000000000000000000000000000000000000..3abcf96fdcb4d94ec5a9889224d7bff10ed507d1 --- /dev/null +++ b/bob/extension/data/subpackage/config.py @@ -0,0 +1 @@ +from ..basic_config import * diff --git a/bob/extension/test_config.py b/bob/extension/test_config.py index 8d777f2ec39e9aced6cad686b1ca1f4fcfd207a1..5f39703297eae31d847dc730dd3a899c2e710cb4 100644 --- a/bob/extension/test_config.py +++ b/bob/extension/test_config.py @@ -49,6 +49,7 @@ def test_entry_point_configs(): os.path.join(path, 'basic_config.py'), 'resource_config', 'bob.extension.data.basic_config', + 'subpackage_config', ], entry_point_group='bob.extension.test_config_load') assert hasattr(c, "a") and c.a == 1 assert hasattr(c, "b") and c.b == 3 diff --git a/setup.py b/setup.py index 17c6f0b825a305c722db79045bcebf0d18de1522..aded8140d195bc566c222d4c1889525bf0ecab52 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,7 @@ setup( 'bob.extension.test_config_load': [ 'basic_config = bob.extension.data.basic_config', 'resource_config = bob.extension.data.resource_config', + 'subpackage_config = bob.extension.data.subpackage.config', ], },