From 7e47a31627fc9ac15540d1b82c9401e625ed6ca4 Mon Sep 17 00:00:00 2001 From: David Schaefer <david.schaefer@ufz.de> Date: Wed, 11 Dec 2019 22:43:34 +0100 Subject: [PATCH] allow ast.Name as test function argument values --- saqc/core/evaluator.py | 2 +- test/core/test_evaluator.py | 2 -- test/core/test_reader.py | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/saqc/core/evaluator.py b/saqc/core/evaluator.py index bdda36d5a..5928e89c9 100644 --- a/saqc/core/evaluator.py +++ b/saqc/core/evaluator.py @@ -135,7 +135,7 @@ class MetaTransformer(ast.NodeTransformer): SUPPORTED_ARGUMENTS = ( ast.Str, ast.Num, ast.NameConstant, ast.Call, - ast.UnaryOp, ast.USub + ast.UnaryOp, ast.USub, ast.Name ) def __init__(self, dsl_transformer, pass_parameter): diff --git a/test/core/test_evaluator.py b/test/core/test_evaluator.py index 237b84f69..d5885e2a8 100644 --- a/test/core/test_evaluator.py +++ b/test/core/test_evaluator.py @@ -53,8 +53,6 @@ def test_typeError(flagger): "func(x=5)", "func(otherFunc())", "func(kwarg=otherFunc(this))", - "func(kwarg=otherFunc(kwarg=this))", - ] for expr in exprs: diff --git a/test/core/test_reader.py b/test/core/test_reader.py index 16749cd0d..f7121fc6f 100644 --- a/test/core/test_reader.py +++ b/test/core/test_reader.py @@ -65,7 +65,6 @@ def test_configChecks(data, flagger, nodata, caplog): tests = [ ({F.VARNAME: var1, F.TESTS: "range(mn=0)"}, TypeError), - ({F.VARNAME: var1, F.TESTS: "range(min=xxx)"}, TypeError), ({F.VARNAME: "temp2", F.TESTS: "range(min=3)"}, NameError), ({F.VARNAME: var3, F.TESTS: "flagNothing()"}, NameError), ({F.VARNAME: "", F.TESTS: "range(min=3)"}, NameError), -- GitLab