Merge pull request #188 from olehermanse/pretty

olehermanse · web-flow · commit a37813181ab8 · 2024-01-24T18:33:20.000+01:00
Allowed numbers in namespaces in module input
diff --git a/cfbs/validate.py b/cfbs/validate.py
@@ -346,10 +346,10 @@ def validate_module_input(name, module):
                     '"%s" is not an acceptable variable name, must match regex "[a-z_]+"'
                     % input_element["variable"],
                 )
-            if not re.fullmatch(r"[a-z_]+", input_element["namespace"]):
+            if not re.fullmatch(r"[a-z_][a-z0-9_]+", input_element["namespace"]):
                 raise CFBSValidationError(
                     name,
-                    '"%s" is not an acceptable namespace, must match regex "[a-z_]+"'
+                    '"%s" is not an acceptable namespace, must match regex "[a-z_][a-z0-9_]+"'
                     % input_element["namespace"],
                 )
             if not re.fullmatch(r"[a-z_]+", input_element["bundle"]):

Original file line number	Diff line number	Diff line change
`@@ -346,10 +346,10 @@ def validate_module_input(name, module):`
`346`	`346`	`'"%s" is not an acceptable variable name, must match regex "[a-z_]+"'`
`347`	`347`	`% input_element["variable"],`
`348`	`348`	`)`
`349`		`- if not re.fullmatch(r"[a-z_]+", input_element["namespace"]):`
	`349`	`+ if not re.fullmatch(r"[a-z_][a-z0-9_]+", input_element["namespace"]):`
`350`	`350`	`raise CFBSValidationError(`
`351`	`351`	`name,`
`352`		`- '"%s" is not an acceptable namespace, must match regex "[a-z_]+"'`
	`352`	`+ '"%s" is not an acceptable namespace, must match regex "[a-z_][a-z0-9_]+"'`
`353`	`353`	`% input_element["namespace"],`
`354`	`354`	`)`
`355`	`355`	`if not re.fullmatch(r"[a-z_]+", input_element["bundle"]):`