annet 3.20.0__tar.gz → 3.20.1__tar.gz

{annet-3.20.0/annet.egg-info → annet-3.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 3.20.0
+Version: 3.20.1
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-3.20.0 → annet-3.20.1}/annet/annlib/rbparser/syntax.py

@@ -72,19 +72,15 @@ def _parse_tree_with_params(raw_tree, scheme, context=None):
     return tree
 
 
-def _parse_raw_rule(raw_rule, scheme):
-    try:
-        index = raw_rule.index("%")
-        params = {
-            key: (value.strip() if len(value.strip()) != 0 else "1")
-            for (key, value) in re.findall(r"%([a-zA-Z_]\w*)(?:=([^%]*))?", raw_rule[index:])
-        }
-        if params:
-            raw_rule = raw_rule[:index].strip()
-    except ValueError:
-        params = {}
+def _parse_raw_rule(raw_rule: str, scheme) -> tuple[str, dict[str, str]]:
+    params: dict[str, str] = {}
+
+    row, *params_raw = re.split(r"(?:^|\s)%(?=[a-zA-Z_]\w*)", raw_rule)
+    for param in params_raw:
+        name, _, value = param.partition("=")
+        params[name] = value.strip() or "1"
 
-    row = re.sub(r"\s+", " ", raw_rule.strip())
+    row = re.sub(r"\s+", " ", row.strip())
     params = _fill_and_validate(params, scheme, raw_rule)
     return row, params
 

{annet-3.20.0 → annet-3.20.1/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 3.20.0
+Version: 3.20.1
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT