diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py index aa6276a2710fb06b7210b9fd8e80f7e012706f1f..f53f47e86a6c584a65b8dbebd39ec43e0f73a17d 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: