From 6be763242056335f85af24f1693d1b106e5f3ebd Mon Sep 17 00:00:00 2001
From: Markus FRANK <Markus.Frank@cern.ch>
Date: Tue, 24 Nov 2020 13:24:04 +0100
Subject: [PATCH] Towards a thread safe expression evaluation....
---
DDG4/python/DDG4.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py
index aa6276a27..f53f47e86 100644
--- a/DDG4/python/DDG4.py
+++ b/DDG4/python/DDG4.py
@@ -111,13 +111,12 @@ def importConstants(description, namespace=None, debug=False):
for k, v in list(todo.items()):
if not hasattr(ns, k):
- val = evaluator.evaluate(v)
- status = evaluator.status()
- if status == 0:
- evaluator.setVariable(k, val)
- setattr(ns, k, val)
+ val = evaluator.evaluate(str(v))
+ if val.first == 0:
+ evaluator.setVariable(str(k), val.second)
+ setattr(ns, k, val.second)
if debug:
- logger.info('Imported global value: "' + k + '" = "' + str(val) + '" into namespace' + ns.__name__)
+ logger.info('Imported global value: "' + k + '" = "' + str(val.second) + '" into namespace' + ns.__name__)
del todo[k]
num = num + 1
if cnt < 100:
--
GitLab