Linting fixes

Author: TeamSpen210

src/hammeraddons/bsp_transform/__init__.py

@@ -1,8 +1,9 @@
 """Transformations that can be applied to the BSP file."""
 from typing import Protocol
+from typing_extensions import deprecated
+
 from collections.abc import Awaitable, Callable, Container, Mapping
 from pathlib import Path
-from warnings import deprecated
 import inspect
 
 import attrs

src/hammeraddons/build_fgd_assets.py

@@ -1,16 +1,15 @@
 """Creates the subset of assets needed for an input FGD to work.
 """
 from __future__ import annotations
+
 from pathlib import Path
 import argparse
-import sys
 import os
+import shutil
+import sys
 
-from srctools.fgd import (
-    FGD, AutoVisgroup, EntAttribute, EntityDef, EntityTypes, Helper, HelperExtAppliesTo,
-    HelperTypes, KVDef, Snippet, ValueTypes, match_tags, validate_tags,
-)
-from srctools.filesys import File, RawFileSystem
+from srctools.fgd import FGD
+from srctools.filesys import RawFileSystem, FileSystemChain
 from srctools.packlist import PackList
 
 
@@ -21,7 +20,7 @@ def action_build(input_path: Path, output_path: Path, asset_path: Path) -> None:
     asset_fsys = RawFileSystem(str(asset_path))
     fgd = FGD()
     fgd.parse_file(fgd_fsys, fgd_fsys[str(input_path)], eval_bases=False, eval_extensions=False, encoding='iso-8859-1')
-    pack = PackList(asset_fsys)
+    pack = PackList(FileSystemChain(asset_fsys))
 
     # Iterate over all entries, build a list of assets
     for classname in fgd.entities:
@@ -34,20 +33,19 @@ def action_build(input_path: Path, output_path: Path, asset_path: Path) -> None:
     pack.eval_dependencies()
 
     # Output all the files we can to our new output
-    for file in pack._files.values():
+    for file in pack:
         try:
             sys_file = asset_fsys[file.filename]
         except FileNotFoundError:
             print(f'WARNING: "{file.filename}" not packed!')
             continue
 
         print(file.filename)
-        with sys_file.open_bin() as f:
-            data = f.read()
+        with sys_file.open_bin() as fsrc:
             new_path = Path(os.path.join(str(output_path), file.filename))
             new_path.parent.mkdir(parents=True, exist_ok=True)
-            with open(new_path, "wb") as out:
-                out.write(data)
+            with open(new_path, "wb") as fdest:
+                shutil.copyfileobj(fsrc, fdest)
 
 
 def main(args: list[str] | None = None) -> None:
@@ -81,5 +79,6 @@ def main(args: list[str] | None = None) -> None:
 
     action_build(input_path, output_path, asset_path)
 
+
 if __name__ == '__main__':
     main(sys.argv[1:])

src/hammeraddons/config.py

@@ -10,7 +10,7 @@
 import sys
 
 from srctools import AtomicWriter, Keyvalues, conv_int, logger, NoKeyError
-from srctools.dmx import Element, ValueType as DMXType, Attribute as DMAttribute
+from srctools.dmx import Element, ValueType as DMXType
 from srctools.filesys import FileSystem, FileSystemChain, RawFileSystem, VPKFileSystem
 from srctools.game import Game
 from srctools.steam import find_app

src/hammeraddons/fgd_reports.py

@@ -140,7 +140,7 @@ def ordering(game: str) -> tuple:
     header = row_temp.format('Game', 'Base', 'Point', 'Brush')
     print('Counted entities.')
 
-    with open(report_dir / 'counts.txt', 'w') as f:
+    with open(report_dir / 'counts.txt', 'w', encoding='utf8') as f:
         f.write(header)
         print('-' * len(header), file=f)
 
@@ -153,12 +153,12 @@ def ordering(game: str) -> tuple:
             ))
 
         f.write('\n\nBases:\n')
-        for base, count in sorted(base_uses.items(), key=lambda x: (len(x[1]), x[0])):
+        for base, used in sorted(base_uses.items(), key=lambda x: (len(x[1]), x[0])):
             ent = fgd[base]
             if ent.type is EntityTypes.BASE and (
                 ent.keyvalues or ent.outputs or ent.inputs
             ):
-                f.write(f'{base} {len(count)} {count if len(count) == 1 else '...'}\n')
+                f.write(f'{base} {len(used)} {used if len(used) == 1 else '...'}\n')
 
     for kind_name, count_map in (
         ('keyvalues', kv_counts),
@@ -168,7 +168,7 @@ def ordering(game: str) -> tuple:
         ('desc', desc_counts)
     ):
         count = 0
-        with open(report_dir / f'duplicate_{kind_name}.txt', 'w') as f:
+        with open(report_dir / f'duplicate_{kind_name}.txt', 'w', encoding='utf8') as f:
             for key, info in sorted(count_map.items(), key=lambda v: len(v[1]), reverse=True):
                 if len(info) <= 2:
                     continue
@@ -215,14 +215,14 @@ def report_factories(
         missing = dump_classes - defined_classes
         all_classes |= defined_classes
         used_classes |= dump_classes
-        with open(report_dir / f'factories_{game.lower()}.txt', 'w') as rep_f:
+        with open(report_dir / f'factories_{game.lower()}.txt', 'w', encoding='utf8') as rep_f:
             rep_f.write('Extraneous definitions: \n')
             pprint(sorted(extra), rep_f, compact=True)
             rep_f.write('\n\nMissing definitions: \n')
             pprint(sorted(missing), rep_f, compact=True)
 
     unused = all_classes - used_classes
-    with open(report_dir / f'factories_unused.txt', 'w') as rep_f:
+    with open(report_dir / 'factories_unused.txt', 'w', encoding='utf8') as rep_f:
         pprint(sorted(unused), rep_f, compact=True)
     print(f'Checked entity factories. {len(unused)} totally unused.')
 
@@ -248,7 +248,7 @@ def report_undefined_resources(fgd: FGD, report_dir: Path) -> None:
             class_res[frozenset(appliesto)].append(ent.classname)
             missing_count += 1
 
-    with open(report_dir / 'undefined_resources.txt', 'w') as f:
+    with open(report_dir / 'undefined_resources.txt', 'w', encoding='utf8') as f:
         for tags_list, classnames in class_res.items():
             classnames.sort()
             f.write(f'{', '.join(tags_list)} = {pformat(classnames, compact=True)}\n')
@@ -271,7 +271,7 @@ def report(msg: str) -> None:
         f.write(f'Ent {ent.classname} res error: {msg}\n')
     res_ctx = ResourceCtx(fgd=fgd)
 
-    with open(report_dir / 'missing_resources.txt', 'w') as f:
+    with open(report_dir / 'missing_resources.txt', 'w', encoding='utf8') as f:
         for ent in fgd.entities.values():
             # Get them all, checking validity in the process.
             for _ in ent.get_resources(res_ctx, ent=None, on_error=report):
@@ -313,7 +313,7 @@ def check_ent_sprites(used: dict[str, list[str]], f: TextIO, ent: EntityDef) ->
 def report_helper_reuse(fgd: FGD, report_dir: Path) -> None:
     """Report missing or reused helpers."""
     mdl_or_sprites: dict[str, list[str]] = defaultdict(list)
-    with open(report_dir / 'helper_reuse.txt', 'w') as f:
+    with open(report_dir / 'helper_reuse.txt', 'w', encoding='utf8') as f:
         for ent in fgd:
             if ent.type is not EntityTypes.BASE and ent.type is not EntityTypes.BRUSH and not ent.is_alias:
                 check_ent_sprites(mdl_or_sprites, f, ent)
@@ -337,13 +337,13 @@ def check_parents(done: set[EntityDef], repeat: set[EntityDef], ent: EntityDef)
                 assert isinstance(base, EntityDef), (ent, ent.bases)
                 check_parents(done, repeat, base)
 
-    with open(report_dir / 'repeated_bases.txt', 'w') as f:
+    with open(report_dir / 'repeated_bases.txt', 'w', encoding='utf8') as f:
         for ent in fgd:
             done: set[EntityDef] = set()
             repeat: set[EntityDef] = set()
             check_parents(done, repeat, ent)
             if repeat:
-                print(
+                f.write(
                     f'Repeated bases: {ent.classname} = '
                     f'{[ent.classname for ent in repeat]}, '
                     f'all={[ent.classname for ent in done]}'

src/hammeraddons/unify_fgd.py

@@ -5,8 +5,8 @@
 from __future__ import annotations
 
 from typing import Any
-from collections.abc import Callable, MutableMapping, Iterator
-from collections import Counter, defaultdict, ChainMap, deque
+from collections.abc import Callable, Iterator
+from collections import Counter, defaultdict, ChainMap
 from pathlib import Path
 import argparse
 import itertools
@@ -16,7 +16,7 @@
 from srctools import fgd
 from srctools.fgd import (
     FGD, AutoVisgroup, EntAttribute, EntityDef, EntityTypes, TagsSet, Helper, HelperExtAppliesTo,
-    HelperTypes, KVDef, ResourceCtx, Snippet, ValueTypes, match_tags, validate_tags
+    HelperTypes, KVDef, Snippet, ValueTypes, match_tags, validate_tags
 )
 from srctools.filesys import File, RawFileSystem
 from srctools.math import Vec, format_float
@@ -684,6 +684,7 @@ def add_tag(tags: TagsSet, new_tag: str) -> TagsSet:
 
     return frozenset(tag_set)
 
+
 def iter_tags(fgd: FGD) -> Iterator[str]:
     """Iterate over all tags defined in the FGD."""
     for ent in fgd:

src/strata_merge.py

@@ -104,8 +104,7 @@ def main() -> None:
     for fname in MERGE_DIR.iterdir():
         fname.unlink()
 
-    with open(REPORT_DIR / '.gitignore', 'w') as f:
-        f.write('*')
+    (REPORT_DIR / '.gitignore').write_text('*')
 
     bases = {
         ent.classname.casefold()
@@ -159,10 +158,10 @@ def main() -> None:
             continue
 
         folder = MERGE_DIR if classname in MERGED else REPORT_DIR
-        with open(folder / f'{classname}.diff', 'w') as f:
+        with open(folder / f'{classname}.diff', 'w', encoding='utf8') as f:
             f.writelines(difflib.unified_diff(
                 ha_text.splitlines(keepends=True), strata_text.splitlines(keepends=True),
-                f'HammerAddons', f'Strata', n=999,
+                'HammerAddons', 'Strata', n=999,
             ))
         if folder is REPORT_DIR:
             count += 1