Tweaks

src/hammeraddons/compare_datadesc.py

@@ -61,7 +61,9 @@ def msg(*args: object) -> None:
         print(*args, file=msgfile)
         bad_ents.add(classname)
 
-    with open(Path(repo_root, 'db', 'datamaps', filename + 'datamap.txt')) as f, open(Path(repo_root, 'db', 'reports', filename + '.txt'), 'w') as msgfile:
+    filename_datamap = Path(repo_root, 'db', 'datamaps', filename + 'datamap.txt')
+    filename_report = Path(repo_root, 'db', 'reports', filename + '.txt')
+    with open(filename_datamap, encoding='ascii') as f, open(filename_report, 'w', encoding='utf8') as msgfile:
         cur_ent: Optional[EntityDef]  # Deliberately uninitialised.
         for line in f:
             if line.startswith('//') or not line.strip():

src/hammeraddons/plugin.py

@@ -1,6 +1,6 @@
 """Logic for loading all the code in arbitary locations for plugin purposes."""
 from typing import (
-    Callable, Dict, Iterable, Iterator, Optional, Sequence, Set, Tuple, Union, Final, Self, final,
+    Callable, Dict, Iterable, Iterator, Optional, Sequence, Set, Tuple, Union, Final, Self,
 )
 from collections import deque
 from importlib.abc import MetaPathFinder

src/hammeraddons/props_config.py

@@ -141,7 +141,7 @@ def __init__(
 class Options:
     """Allows parsing a set of Keyvalues option blocks."""
     defaults: List[Opt]
-    settings: Dict[str, Union[None, str, int, float, bool, Vec, Keyvalues]]
+    settings: Dict[str, Union[str, int, float, bool, Vec, Keyvalues, None]]
     path: Optional[Path]
 
     def __init__(self, defaults: Union[Iterable[Opt], dict]) -> None:

src/hammeraddons/unify_fgd.py

@@ -1252,7 +1252,8 @@ def action_export(
         todo = ent.bases.copy()
         done = set(todo)
         ent.bases.clear()
-        for base in todo:
+        while todo:
+            base = todo.pop()
             assert isinstance(base, EntityDef), base
             if base.type is not EntityTypes.BASE or base in used_bases:
                 ent.bases.append(base)