Skip to content

Commit 6275849

Browse files
committed
Bugfix the loading of local module
1 parent 24e5b48 commit 6275849

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

biothings/cli/commands/config.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,15 @@ def load_local_configuration() -> types.ModuleType:
285285
sys.modules["config"] = config_module
286286
sys.modules["biothings.config"] = config_module
287287

288+
spec.loader.exec_module(config_module)
289+
288290
try:
289291
backend = getattr(config_module, "HUB_DB_BACKEND")
290292
setattr(config_module, "hub_db", importlib.import_module(backend["module"]))
291293
except ImportError as import_err:
292294
logging.exception(import_err)
293295
raise import_err
294296

295-
spec.loader.exec_module(config_module)
296-
297297
for attr in dir(config_module):
298298
value = getattr(config_module, attr)
299299
if isinstance(value, ConfigurationError):
@@ -307,15 +307,22 @@ def load_default_configuration():
307307
"""
308308
Loads the default configuration into a DummyConfig
309309
"""
310-
configuration_instance = DummyConfig("config")
310+
config_module = DummyConfig("config")
311311
default_configuration_values = default_biothings_configuration()
312312
for configuration_key, configuration_value in default_configuration_values.items():
313-
setattr(configuration_instance, configuration_key, configuration_value)
313+
setattr(config_module, configuration_key, configuration_value)
314+
315+
try:
316+
backend = getattr(config_module, "HUB_DB_BACKEND")
317+
setattr(config_module, "hub_db", importlib.import_module(backend["module"]))
318+
except ImportError as import_err:
319+
logging.exception(import_err)
320+
raise import_err
314321

315-
sys.modules["config"] = configuration_instance
316-
sys.modules["biothings.config"] = configuration_instance
322+
sys.modules["config"] = config_module
323+
sys.modules["biothings.config"] = config_module
317324

318-
return configuration_instance
325+
return config_module
319326

320327
def load_configuration() -> Union[types.ModuleType, DummyConfig]:
321328
"""

0 commit comments

Comments
 (0)