Fix: exec in is not python3 compatible, use dicts as args instead

sjleefg02 · Nov 3, 2018 · 9ab314c · 9ab314c
1 parent d947b4c
commit 9ab314c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/mdsobjects/python/tree.py b/mdsobjects/python/tree.py
@@ -3266,7 +3266,7 @@ def getImportString(cls):
         try:
             import_string = "from %s import %s" % (cls.__module__.split('.',1)[0],cls.__name__)
             # test if this would work
-            exec(compile(import_string,'<string>','exec')) in {},{}
+            exec(compile(import_string,'<string>','exec'),{},{})
             return import_string
         except ImportError:
             try:

diff --git a/tdi/python/Py.py b/tdi/python/Py.py
@@ -55,7 +55,7 @@ def Py(cmds, *arg):
     cmds="\n".join(cmdlist)
     env = {"arg":arg,'MDSplus':MDSplus}
     try:
-        exec(compile(cmds,'<string>','exec'),globals(),env)
+        exec(compile(cmds,'<string>','exec'),env,env)
     except Exception as exc:
         _tb.print_exc()
         MDSplus.String(exc).setTdiVar("_py_exception")

diff --git a/tdi/python/addfun.py b/tdi/python/addfun.py
@@ -19,7 +19,7 @@ def addfun(name,code):
        sys.modules[modulename] = types.ModuleType(modulename)
     code = MDSplus.Data.data(code)
     env = {}
-    exec(code) in env
+    exec(compile(code,"TDI/%s"%(name,),'exec'),env,env)
     sys.modules[modulename].__dict__[mdsname] = env[name]
     mdsname = MDSplus.String(mdsname)
     return MDSplus.EQUALS(MDSplus.PUBLIC(mdsname),mdsname).evaluate()