refs #708 support python 3.12 when loading modules
parent
18f1314521
commit
274d8d448c
|
@ -43,6 +43,8 @@ from opengnsys.workers import ServerWorker
|
||||||
from opengnsys.workers import ClientWorker
|
from opengnsys.workers import ClientWorker
|
||||||
from .log import logger
|
from .log import logger
|
||||||
|
|
||||||
|
PY3_12 = sys.version_info[0:2] >= (3, 12)
|
||||||
|
|
||||||
|
|
||||||
def loadModules(controller, client=False):
|
def loadModules(controller, client=False):
|
||||||
'''
|
'''
|
||||||
|
@ -89,7 +91,11 @@ def loadModules(controller, client=False):
|
||||||
for (module_loader, name, ispkg) in pkgutil.iter_modules(paths, modPath + '.'):
|
for (module_loader, name, ispkg) in pkgutil.iter_modules(paths, modPath + '.'):
|
||||||
if ispkg:
|
if ispkg:
|
||||||
logger.debug('Found module package {}'.format(name))
|
logger.debug('Found module package {}'.format(name))
|
||||||
module_loader.find_module(name).load_module(name)
|
if PY3_12:
|
||||||
|
loader = module_loader.find_spec(name).loader
|
||||||
|
else:
|
||||||
|
loader = module_loader.find_module(name)
|
||||||
|
loader.load_module(name)
|
||||||
|
|
||||||
|
|
||||||
if controller.config.has_option('opengnsys', 'path') is True:
|
if controller.config.has_option('opengnsys', 'path') is True:
|
||||||
|
|
Loading…
Reference in New Issue