Changeset f923967 in sasview for src/sas/sascalc/fit

Timestamp:

Mar 12, 2019 9:24:42 AM (6 years ago)

Author:

Jeff Krzywon <jkrzywon@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

1342f6a

Parents:

82d88d5 (diff), 9a1204d (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 'master' into py37-sasgui

File:

• src/sas/sascalc/fit/expression.py (modified) (4 diffs)

src/sas/sascalc/fit/expression.py

@@ -188 +188 @@
 
     # Initialize dictionary with available functions
-    globals = {}
-    globals.update(math.__dict__)
-    globals.update(dict(arcsin=math.asin,arccos=math.acos,
-                        arctan=math.atan,arctan2=math.atan2))
-    globals.update(context)
-    globals.update(parameters)
-    globals['id'] = id
-    locals = {}
+    global_context = {}
+    global_context.update(math.__dict__)
+    global_context.update(dict(arcsin=math.asin,arccos=math.acos,
+                               arctan=math.atan,arctan2=math.atan2))
+    global_context.update(context)
+    global_context.update(parameters)
+    global_context['id'] = id
+    local_context = {}
 
     # Define the constraints function
@@ -210 +210 @@
 
     #print("Function: "+functiondef)
-    exec(functiondef, globals, locals)
-    retfn = locals['eval_expressions']
+    # CRUFT: python < 3.0;  doc builder isn't allowing the following exec
+    # https://stackoverflow.com/questions/4484872/why-doesnt-exec-work-in-a-function-with-a-subfunction/41368813#comment73790496_41368813
+    #exec(functiondef, global_context, local_context)
+    eval(compile(functiondef, '<string>', 'exec'), global_context, local_context)
+    retfn = local_context['eval_expressions']
 
     # Remove garbage added to globals by exec
-    globals.pop('__doc__',None)
-    globals.pop('__name__',None)
-    globals.pop('__file__',None)
-    globals.pop('__builtins__')
+    global_context.pop('__doc__', None)
+    global_context.pop('__name__', None)
+    global_context.pop('__file__', None)
+    global_context.pop('__builtins__')
     #print globals.keys()
 
@@ -232 +235 @@
 
     # Break pairs into left set and right set
-    left,right = [set(s) for s in zip(*pairs)] if pairs != [] else ([],[])
-    while pairs != []:
+    # Note: pairs is array or list, so use "len(pairs) > 0" to check for empty.
+    left,right = [set(s) for s in zip(*pairs)] if len(pairs) > 0 else ([],[])
+    while len(pairs) > 0:
         #print "within",pairs
         # Find which items only occur on the right
@@ -261 +265 @@
     satisfies the partial ordering given by the pairs in partial order.
     """
-    left,right = zip(*pairs) if pairs != [] else ([],[])
+    # Note: pairs is array or list, so use "len(pairs) > 0" to check for empty.
+    left,right = zip(*pairs) if len(pairs) > 0 else ([],[])
     items = set(left)
     n = order_dependencies(pairs)