Skip to content

Commit e61a07f

Browse files
authored
Merge pull request #380 from capocchi/version-5.1
bug fix
2 parents 55a35d2 + b72e6bc commit e61a07f

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

devsimpy/DEVSKernel/Strategies.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,16 @@
4646

4747
### for py 3.X
4848
import importlib
49-
exec("%s = importlib.import_module('DEVSKernel%s.DEVS')"%(pydevs_dir,d))
49+
# Try importing as top-level package (DEVSKernel...), otherwise
50+
# fallback to package-qualified name (devsimpy.DEVSKernel...)
51+
modname = f"DEVSKernel{d}.DEVS"
52+
try:
53+
module = importlib.import_module(modname)
54+
except ModuleNotFoundError:
55+
fallback = f"devsimpy.DEVSKernel{d}.DEVS"
56+
module = importlib.import_module(fallback)
57+
# expose under the expected name (PyDEVS, KafkaDEVS, ...)
58+
globals()[pydevs_dir] = module
5059

5160

5261
## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ##

0 commit comments

Comments
 (0)