Changeset d744767 in sasview for src/sas/sascalc/fit/expression.py

Timestamp:

Mar 16, 2018 2:05:42 PM (6 years ago)

Author:

krzywon

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

47bf906

Parents:

477c473 (diff), e4c475b7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' into ESS_GUI_Pr

File:

• src/sas/sascalc/fit/expression.py (modified) (1 diff)

src/sas/sascalc/fit/expression.py

@@ -210 +210 @@
 
     #print("Function: "+functiondef)
-    exec functiondef in globals,locals
+    # Python 2.7
+    #exec (functiondef in globals,locals)
+    # Python 3.5
+    exec (functiondef, globals, locals)
+
     retfn = locals['eval_expressions']