pylint cleanups

This commit is contained in:
Ian McEwen
2026-05-31 10:01:39 -07:00
parent 280323da8b
commit 3916009dbd
2 changed files with 35 additions and 16 deletions

View File

@@ -21,7 +21,7 @@ generated by regen-protobufs.sh, not the source .proto files.
import re
import sys
from pathlib import Path
from typing import Any, Dict, List, Optional, Tuple
from typing import Any, Dict, List, Tuple
# IntSize enum values from nanopb.proto
INT_SIZE_ENUM = {8: "IS_8", 16: "IS_16", 32: "IS_32", 64: "IS_64"}
@@ -72,7 +72,7 @@ def parse_options_file(
specific: Dict[Tuple[str, ...], Dict[str, Any]] = {}
wildcard: Dict[str, Dict[str, Any]] = {}
with open(path) as f:
with open(path, encoding="utf-8") as f:
for line in f:
# Strip inline comments
comment_pos = line.find("#")
@@ -287,6 +287,7 @@ def inject_into_proto(
def main() -> int:
"""Parse an .options file and inject its constraints into a .proto file in-place."""
if len(sys.argv) != 3:
print(
f"Usage: {sys.argv[0]} <options_file> <proto_file>",
@@ -312,13 +313,13 @@ def main() -> int:
print(f" [{opts_path.name}] No injectable options found, skipping.")
return 0
content = proto_path.read_text()
content = proto_path.read_text(encoding="utf-8")
# After regen-protobufs.sh's sed fixup, the nanopb import path is:
nanopb_import_path = "meshtastic/protobuf/nanopb.proto"
modified = inject_into_proto(content, specific, wildcard, nanopb_import_path)
proto_path.write_text(modified)
proto_path.write_text(modified, encoding="utf-8")
print(
f" [{opts_path.name}] Injected {len(specific)} specific + "