Skip to content

Fix VAP micro helpers type consistency and validation parsing #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmaynor wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix VAP micro helpers type consistency and validation parsing #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions vap_micro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def _require_keys(kind: str, kv: Dict[str, str]) -> None:

def _pairs_to_dict(pairs: str) -> Dict[str, str]:
"""
Convert semicolon pairs "k1:v1;k2:v2;flag" to dict; bare tokens => True.
Convert semicolon pairs "k1:v1;k2:v2;flag" to dict; bare tokens => "true".
"""
result: Dict[str, str] = {}
if not pairs:
Expand All @@ -144,7 +144,7 @@ def _pairs_to_dict(pairs: str) -> Dict[str, str]:
k, v = item.split(":", 1)
result[k.strip()] = v.strip()
else:
result[item] = True
result[item] = "true"
return result


Expand All @@ -159,7 +159,7 @@ def _plus_list(val: str) -> List[str]:
def _to_int(val: str) -> int:
try:
return int(val)
except Exception:
except ValueError:
return 0


Expand Down Expand Up @@ -272,7 +272,7 @@ def validate(line: str) -> Dict[str, object]:
try:
_require_keys(kind, kv)
except KeyError as e:
missing = re.findall(r"\[(.*?)\]", str(e))
missing = re.findall(r"'([^']+)'", str(e))
report.update({"ok": False, "kind": kind, "missing": missing})
return report
# Decoding will raise if anything else is wrong
Expand Down