Merge pull request #384 from European-XFEL/fix/variableNameValidation

fix variable name validation

damnit/ctxsupport/damnit_ctx.py

@@ -60,9 +60,9 @@ def __call__(self, func):
 
     def check(self):
         problems = []
-        if not re.fullmatch(r"[a-zA-Z_]\w+", self.name, flags=re.A):
+        if not self.name.isidentifier():
             problems.append(
-                f"The variable name {self.name!r} is not of the form '[a-zA-Z_]\\w+'"
+                f"The variable name {self.name!r} is not a valid Python identifier"
             )
         if self._data not in (None, "raw", "proc"):
             problems.append(

tests/test_backend.py

@@ -168,6 +168,10 @@ def bar(run, foo: "var#foo"):
     @Variable(title="foo")
     def foo(run, sample: "mymdc#sample_name", run_type: "mymdc#run_type"):
         return 42
+
+    @Variable(title='X')
+    def X(run, foo: "var#foo"):
+        return foo
     """
     # This should not raise an exception
     mkcontext(good_mymdc_code).check()
@@ -198,7 +202,6 @@ def foo(run):
     with pytest.raises(ContextFileErrors, match='must be a non-empty string'):
         ctx.check()
 
-
 def run_ctx_helper(context, run, run_number, proposal, caplog, input_vars=None):
     # Track all error messages during creation. This is necessary because a
     # variable that throws an error will be logged by Results, the exception