Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions buildscripts/moduleconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
__all__ = ('discover_modules', 'discover_module_directories', 'configure_modules',
'register_module_test') # pylint: disable=undefined-all-variable

import imp
import importlib
import inspect
import os

Expand Down Expand Up @@ -68,16 +68,14 @@ def discover_modules(module_root, allowed_modules):

try:
print("adding module: %s" % (name))
fp = open(build_py, "r")
try:
module = imp.load_module("module_" + name, fp, build_py,
(".py", "r", imp.PY_SOURCE))
if getattr(module, "name", None) is None:
module.name = name
found_modules.append(module)
found_module_names.append(name)
finally:
fp.close()
spec = importlib.util.spec_from_file_location("module_" + name, build_py)
module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(module)

if getattr(module, "name", None) is None:
module.name = name
found_modules.append(module)
found_module_names.append(name)
except (FileNotFoundError, IOError):
pass

Expand Down