splat64 0.36.1__tar.gz → 0.36.3__tar.gz

splat64-0.36.3/.github/workflows/format.yml

@@ -0,0 +1,27 @@
+name: Check code is formatted
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  black_checks:
+    runs-on: ubuntu-latest
+    name: Check format with Ruff
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@main
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
+
+      - name: Install Dependencies
+        run: |
+          pip install ruff
+          pip install -r requirements.txt
+          pip install types-PyYAML
+
+      - name: Ruff format
+        run: ruff format --check .

splat64-0.36.3/.github/workflows/lint.yml

@@ -0,0 +1,104 @@
+name: Lint splat
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  ruff_splat_checks:
+    runs-on: ubuntu-latest
+    name: Ruff check splat lib
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@main
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
+
+      - name: Install Dependencies
+        run: |
+          pip install ruff
+          pip install -r requirements.txt
+          pip install types-PyYAML
+          pip install -e .
+
+      - name: ruff splat lib
+        run: ruff check src/splat
+
+  ruff_lint_programs_checks:
+    runs-on: ubuntu-latest
+    name: Ruff check splat programs
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@main
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
+
+      - name: Install Dependencies
+        run: |
+          pip install ruff
+          pip install -r requirements.txt
+          pip install types-PyYAML
+
+      - name: ruff split
+        run: ruff check split.py
+
+      - name: ruff create_config
+        run: ruff check create_config.py
+
+      - name: ruff test
+        run: ruff check test.py
+
+  mypy_splat_checks:
+    runs-on: ubuntu-latest
+    name: mypy splat lib
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@main
+
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.9
+
+    - name: Install Dependencies
+      run: |
+        pip install mypy
+        pip install -r requirements.txt
+        pip install types-PyYAML
+        pip install -e .
+
+    - name: mypy splat lib
+      run: mypy --show-column-numbers --hide-error-context src/splat
+
+  mypy_programs_checks:
+    runs-on: ubuntu-latest
+    name: mypy splat programs
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@main
+
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.9
+
+    - name: Install Dependencies
+      run: |
+        pip install mypy
+        pip install -r requirements.txt
+        pip install types-PyYAML
+
+    - name: mypy split
+      run: mypy --show-column-numbers --hide-error-context split.py
+
+    - name: mypy create_config
+      run: mypy --show-column-numbers --hide-error-context create_config.py
+
+    - name: mypy test
+      run: mypy --show-column-numbers --hide-error-context test.py

{splat64-0.36.1 → splat64-0.36.3}/CHANGELOG.md

@@ -1,8 +1,19 @@
 # splat Release Notes
 
+### 0.36.3
+
+* Fix not generating nonmatching `.s` files for quoted symbols.
+  * Symbol is automatically quoted if it contains in its name any of `@`, `<`, `\\`, `-` or `+`.
+* `spimdisasm` 1.38.0 or above is now required.
+
+### 0.36.2
+
+* Fix a regression on the R3000GTE `dpct` instruction on autogenerated the `gte_macros.s` file.
+
 ### 0.36.1
+
 * Files generated with `generate_asm_macros_files` will not be overwritten if they already exist on disk unchanged.
-* Updated GTE macros to better document opcode encodings
+* Updated GTE macros to better document opcode encodings.
 
 ### 0.36.0
 

{splat64-0.36.1 → splat64-0.36.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splat64
-Version: 0.36.1
+Version: 0.36.3
 Summary: A binary splitting tool to assist with decompilation and modding projects
 Project-URL: Repository, https://github.com/ethteck/splat
 Project-URL: Issues, https://github.com/ethteck/splat/issues
@@ -36,13 +36,13 @@ Requires-Dist: pylibyaml
 Requires-Dist: pyyaml
 Requires-Dist: tqdm
 Provides-Extra: dev
-Requires-Dist: black; extra == 'dev'
 Requires-Dist: crunch64<1.0.0,>=0.5.1; extra == 'dev'
 Requires-Dist: mypy; extra == 'dev'
 Requires-Dist: n64img>=0.3.3; extra == 'dev'
 Requires-Dist: pygfxd; extra == 'dev'
 Requires-Dist: rabbitizer<2.0.0,>=1.12.0; extra == 'dev'
-Requires-Dist: spimdisasm<2.0.0,>=1.36.1; extra == 'dev'
+Requires-Dist: ruff; extra == 'dev'
+Requires-Dist: spimdisasm<2.0.0,>=1.38.0; extra == 'dev'
 Requires-Dist: types-colorama; extra == 'dev'
 Requires-Dist: types-pyyaml; extra == 'dev'
 Provides-Extra: mips
@@ -50,7 +50,7 @@ Requires-Dist: crunch64<1.0.0,>=0.5.1; extra == 'mips'
 Requires-Dist: n64img>=0.3.3; extra == 'mips'
 Requires-Dist: pygfxd; extra == 'mips'
 Requires-Dist: rabbitizer<2.0.0,>=1.12.0; extra == 'mips'
-Requires-Dist: spimdisasm<2.0.0,>=1.36.1; extra == 'mips'
+Requires-Dist: spimdisasm<2.0.0,>=1.38.0; extra == 'mips'
 Description-Content-Type: text/markdown
 
 # splat
@@ -76,7 +76,7 @@ The brackets corresponds to the optional dependencies to install while installin
 If you use a `requirements.txt` file in your repository, then you can add this library with the following line:
 
 ```txt
-splat64[mips]>=0.36.1,<1.0.0
+splat64[mips]>=0.36.3,<1.0.0
 ```
 
 ### Optional dependencies

{splat64-0.36.1 → splat64-0.36.3}/README.md

@@ -21,7 +21,7 @@ The brackets corresponds to the optional dependencies to install while installin
 If you use a `requirements.txt` file in your repository, then you can add this library with the following line:
 
 ```txt
-splat64[mips]>=0.36.1,<1.0.0
+splat64[mips]>=0.36.3,<1.0.0
 ```
 
 ### Optional dependencies

{splat64-0.36.1 → splat64-0.36.3}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "splat64"
 # Should be synced with src/splat/__init__.py
-version = "0.36.1"
+version = "0.36.3"
 description = "A binary splitting tool to assist with decompilation and modding projects"
 readme = "README.md"
 license = {file = "LICENSE"}
@@ -20,7 +20,7 @@ dependencies = [
 
 [project.optional-dependencies]
 mips = [
-    "spimdisasm>=1.36.1,<2.0.0", # This value should be keep in sync with the version listed on disassembler/spimdisasm_disassembler.py
+    "spimdisasm>=1.38.0,<2.0.0", # This value should be keep in sync with the version listed on disassembler/spimdisasm_disassembler.py
     "rabbitizer>=1.12.0,<2.0.0",
     "pygfxd",
     "n64img>=0.3.3",
@@ -28,8 +28,8 @@ mips = [
 ]
 dev = [
     "splat64[mips]",
+    "ruff",
     "mypy",
-    "black",
     "types-PyYAML",
     "types-colorama",
 ]

{splat64-0.36.1 → splat64-0.36.3}/requirements.txt

@@ -4,7 +4,7 @@ tqdm
 intervaltree
 colorama
 # This value should be keep in sync with the version listed on disassembler/spimdisasm_disassembler.py and pyproject.toml
-spimdisasm>=1.36.1
+spimdisasm>=1.38.0
 rabbitizer>=1.10.0
 pygfxd
 n64img>=0.1.4

{splat64-0.36.1 → splat64-0.36.3}/src/splat/__init__.py

@@ -1,7 +1,7 @@
 __package_name__ = __name__
 
 # Should be synced with pyproject.toml
-__version__ = "0.36.1"
+__version__ = "0.36.3"
 __author__ = "ethteck"
 
 from . import util as util

{splat64-0.36.1 → splat64-0.36.3}/src/splat/disassembler/__init__.py

@@ -1,4 +1,3 @@
 from . import disassembler as disassembler
 from . import spimdisasm_disassembler as spimdisasm_disassembler
 from . import disassembler_section as disassembler_section
-from . import disassembler_section as disassembler_section

{splat64-0.36.1 → splat64-0.36.3}/src/splat/disassembler/null_disassembler.py

@@ -1,5 +1,4 @@
 from . import disassembler
-from ..util.options import SplatOpts
 from typing import Set
 
 

{splat64-0.36.1 → splat64-0.36.3}/src/splat/disassembler/spimdisasm_disassembler.py

@@ -7,7 +7,7 @@ from typing import Set
 
 class SpimdisasmDisassembler(disassembler.Disassembler):
     # This value should be kept in sync with the version listed on requirements.txt and pyproject.toml
-    SPIMDISASM_MIN = (1, 36, 1)
+    SPIMDISASM_MIN = (1, 38, 0)
 
     def configure(self):
         # Configure spimdisasm

{splat64-0.36.1 → splat64-0.36.3}/src/splat/platforms/ps2.py

@@ -1,8 +1,6 @@
 import spimdisasm
 import rabbitizer
 
-from ..util import compiler, options
-
 
 def init(target_bytes: bytes):
     rabbitizer.config.toolchainTweaks_treatJAsUnconditionalBranch = False

{splat64-0.36.1 → splat64-0.36.3}/src/splat/scripts/create_config.py

@@ -223,7 +223,7 @@ segments:
             f"// The address of the end of the stack is 0x{rom.entrypoint_info.stack_top.value:08X}."
         )
         reloc_addrs.append(
-            f"// A common size for this stack is 0x2000, so try checking for the address 0x{rom.entrypoint_info.stack_top.value-0x2000:08X}. Note the stack may have a different size."
+            f"// A common size for this stack is 0x2000, so try checking for the address 0x{rom.entrypoint_info.stack_top.value - 0x2000:08X}. Note the stack may have a different size."
         )
         reloc_addrs.append(
             f"// rom:0x{rom.entrypoint_info.stack_top.rom_hi:06X} reloc:MIPS_HI16 symbol:main_stack addend:0xXXXX"

{splat64-0.36.1 → splat64-0.36.3}/src/splat/scripts/split.py

@@ -138,12 +138,12 @@ def initialize_segments(config_segments: Union[dict, list]) -> List[Segment]:
                             )
 
                         # Not user error, hopefully...
-                        assert (
-                            seg.paired_segment is None
-                        ), f"Somehow '{seg.name}' was already paired so something else? It is paired to '{seg.paired_segment.name}' instead of {other_seg.name}"
-                        assert (
-                            other_seg.paired_segment is None
-                        ), f"Somehow '{other_seg.name}' was already paired so something else? It is paired to '{other_seg.paired_segment.name}' instead of {seg.name}"
+                        assert seg.paired_segment is None, (
+                            f"Somehow '{seg.name}' was already paired so something else? It is paired to '{seg.paired_segment.name}' instead of {other_seg.name}"
+                        )
+                        assert other_seg.paired_segment is None, (
+                            f"Somehow '{other_seg.name}' was already paired so something else? It is paired to '{other_seg.paired_segment.name}' instead of {seg.name}"
+                        )
 
                         found = True
                         # Pair them
@@ -216,9 +216,9 @@ def calc_segment_dependences(
 
             for follows_class in vram_class.follows_classes:
                 if follows_class in vram_class_to_segments:
-                    vram_class_to_follows_segments[
-                        vram_class
-                    ] += vram_class_to_segments[follows_class]
+                    vram_class_to_follows_segments[vram_class] += (
+                        vram_class_to_segments[follows_class]
+                    )
     return vram_class_to_follows_segments
 
 

{splat64-0.36.1 → splat64-0.36.3}/src/splat/segtypes/common/asm.py

@@ -1,7 +1,5 @@
-from pathlib import Path
-from typing import Optional, List
+from typing import Optional
 
-from ...util import options
 
 from .codesubsegment import CommonSegCodeSubsegment
 

{splat64-0.36.1 → splat64-0.36.3}/src/splat/segtypes/common/bin.py

@@ -3,7 +3,8 @@ from typing import Optional
 
 from ...util import log, options
 
-from .segment import CommonSegment, SegmentType
+from .segment import CommonSegment
+from ..segment import SegmentType
 
 
 class CommonSegBin(CommonSegment):

{splat64-0.36.1 → splat64-0.36.3}/src/splat/segtypes/common/c.py

@@ -177,9 +177,9 @@ class CommonSegC(CommonSegCodeSubsegment):
                     if rodata_sibling.is_generated:
                         continue
 
-                    assert isinstance(
-                        rodata_sibling, CommonSegRodata
-                    ), f"{rodata_sibling}, {rodata_sibling.type}"
+                    assert isinstance(rodata_sibling, CommonSegRodata), (
+                        f"{rodata_sibling}, {rodata_sibling.type}"
+                    )
 
                     if not rodata_sibling.type.startswith("."):
                         # Emit an error if we try to migrate the rodata symbols to functions if the rodata section is not prefixed with a dot
@@ -237,7 +237,7 @@ class CommonSegC(CommonSegCodeSubsegment):
                 entry.sectionRodata = rodata_section_type
                 if entry.function is not None:
                     if (
-                        entry.function.getName() in self.global_asm_funcs
+                        entry.function.getNameUnquoted() in self.global_asm_funcs
                         or is_new_c_file
                         or options.opts.disassemble_all
                     ):
@@ -250,7 +250,8 @@ class CommonSegC(CommonSegCodeSubsegment):
                         assert func_sym is not None
 
                         if (
-                            entry.function.getName() not in self.global_asm_funcs
+                            entry.function.getNameUnquoted()
+                            not in self.global_asm_funcs
                             and options.opts.disassemble_all
                             and not is_new_c_file
                         ):
@@ -263,7 +264,8 @@ class CommonSegC(CommonSegCodeSubsegment):
                 else:
                     for spim_rodata_sym in entry.rodataSyms:
                         if (
-                            spim_rodata_sym.getName() in self.global_asm_rodata_syms
+                            spim_rodata_sym.getNameUnquoted()
+                            in self.global_asm_rodata_syms
                             or is_new_c_file
                             or options.opts.disassemble_all
                         ):
@@ -307,7 +309,7 @@ class CommonSegC(CommonSegCodeSubsegment):
                     "\nA gap was detected in migrated rodata symbols!", status="warn"
                 )
                 log.write(
-                    f"\t In function '{func.getName()}' (0x{func.vram:08X}), gap detected between '{rodata_sym.getName()}' (0x{rodata_sym.vram:08X}) and '{next_rodata_sym.getName()}' (0x{next_rodata_sym.vram:08X})"
+                    f"\t In function '{func.getNameUnquoted()}' (0x{func.vram:08X}), gap detected between '{rodata_sym.getNameUnquoted()}' (0x{rodata_sym.vram:08X}) and '{next_rodata_sym.getNameUnquoted()}' (0x{next_rodata_sym.vram:08X})"
                 )
                 log.write(
                     f"\t The address of the missing rodata symbol is 0x{rodata_sym.vramEnd:08X}"
@@ -414,7 +416,7 @@ class CommonSegC(CommonSegCodeSubsegment):
             and spim_sym.instructions[0].isReturn()
             and spim_sym.instructions[1].isNop()
         ):
-            c_lines.append(f"void {spim_sym.getName()}(void) {{")
+            c_lines.append(f"void {spim_sym.getNameUnquoted()}(void) {{")
             c_lines.append("}")
         else:
             c_lines.append(
@@ -492,7 +494,7 @@ class CommonSegC(CommonSegCodeSubsegment):
             depend_list = []
             for entry in symbols_entries:
                 if entry.function is not None:
-                    func_name = entry.function.getName()
+                    func_name = entry.function.getNameUnquoted()
 
                     if func_name in self.global_asm_funcs or is_new_c_file:
                         outpath = asm_out_dir / self.name / (func_name + ".s")
@@ -502,7 +504,7 @@ class CommonSegC(CommonSegCodeSubsegment):
                         f.write(f" \\\n    {outpath.as_posix()}")
                 else:
                     for rodata_sym in entry.rodataSyms:
-                        rodata_name = rodata_sym.getName()
+                        rodata_name = rodata_sym.getNameUnquoted()
 
                         if rodata_name in self.global_asm_rodata_syms or is_new_c_file:
                             outpath = asm_out_dir / self.name / (rodata_name + ".s")

{splat64-0.36.1 → splat64-0.36.3}/src/splat/segtypes/common/code.py

@@ -1,5 +1,5 @@
 from collections import OrderedDict
-from typing import OrderedDict, List, Optional, Type, Tuple
+from typing import List, Optional, Type, Tuple
 
 from ...util import log, options, utils
 

{splat64-0.36.1 → splat64-0.36.3}/src/splat/segtypes/common/codesubsegment.py

@@ -182,7 +182,7 @@ class CommonSegCodeSubsegment(Segment):
                 print(
                     "File split suggestions for this segment will follow in config yaml format:"
                 )
-            print(f"      - [0x{self.rom_start+in_file_offset:X}, {self.type}]")
+            print(f"      - [0x{self.rom_start + in_file_offset:X}, {self.type}]")
 
     def should_scan(self) -> bool:
         return (

{splat64-0.36.1 → splat64-0.36.3}/src/splat/segtypes/common/databin.py

@@ -1,4 +1,3 @@
-from pathlib import Path
 from typing import Optional
 
 from ...util import log, options

{splat64-0.36.1 → splat64-0.36.3}/src/splat/segtypes/common/rodata.py

@@ -130,7 +130,7 @@ class CommonSegRodata(CommonSegData):
                         f"\nRodata segment '{self.name}' may belong to the text segment '{text_segment.name}'"
                     )
                     print(
-                        f"    Based on the usage from the function {refenceeFunction.getName()} to the symbol {symbol.getName()}"
+                        f"    Based on the usage from the function {refenceeFunction.getNameUnquoted()} to the symbol {symbol.getNameUnquoted()}"
                     )
                     possible_text_segments.add(text_segment)
 

{splat64-0.36.1 → splat64-0.36.3}/src/splat/segtypes/common/rodatabin.py

@@ -1,4 +1,3 @@
-from pathlib import Path
 from typing import Optional
 
 from ...util import log, options

splat64-0.36.3/src/splat/segtypes/common/segment.py

@@ -0,0 +1,5 @@
+from ...segtypes.segment import Segment
+
+
+class CommonSegment(Segment):
+    pass

{splat64-0.36.1 → splat64-0.36.3}/src/splat/segtypes/linker_entry.py

@@ -162,9 +162,9 @@ class LinkerEntry:
             linker_writer._write_symbol(path_cname, ".")
 
     def emit_path(self, linker_writer: "LinkerWriter"):
-        assert (
-            self.object_path is not None
-        ), f"{self.segment.name}, {self.segment.rom_start}"
+        assert self.object_path is not None, (
+            f"{self.segment.name}, {self.segment.rom_start}"
+        )
 
         if self.noload and self.bss_contains_common:
             linker_writer._write_object_path_section(
@@ -237,9 +237,9 @@ class LinkerWriter:
             return
 
         section_entries: OrderedDict[str, List[LinkerEntry]] = OrderedDict()
-        for l in segment.section_order:
-            if l in options.opts.section_order:
-                section_entries[l] = []
+        for section_name in segment.section_order:
+            if section_name in options.opts.section_order:
+                section_entries[section_name] = []
 
         # Add all entries to section_entries
         prev_entry = None
@@ -301,7 +301,7 @@ class LinkerWriter:
 
         # To keep track which sections has been started
         started_sections: Dict[str, bool] = {
-            l: False for l in options.opts.section_order
+            section_name: False for section_name in options.opts.section_order
         }
 
         # Find where sections are last seen
@@ -389,14 +389,19 @@ class LinkerWriter:
 
             self._begin_segment(segment, seg_name, noload=False, is_first=is_first)
 
-            for l in segment.section_order:
-                if l not in options.opts.section_order:
+            for section_name in segment.section_order:
+                if section_name not in options.opts.section_order:
                     continue
-                if l == ".bss":
+                if section_name == ".bss":
                     continue
 
                 entry = LinkerEntry(
-                    segment, [], segments_path / f"{seg_name}.o", l, l, noload=False
+                    segment,
+                    [],
+                    segments_path / f"{seg_name}.o",
+                    section_name,
+                    section_name,
+                    noload=False,
                 )
                 self.dependencies_entries.append(entry)
                 entry.emit_entry(self)
@@ -439,9 +444,9 @@ class LinkerWriter:
         seg_name = segment.get_cname()
 
         section_entries: OrderedDict[str, List[LinkerEntry]] = OrderedDict()
-        for l in segment.section_order:
-            if l in options.opts.section_order:
-                section_entries[l] = []
+        for section_name in segment.section_order:
+            if section_name in options.opts.section_order:
+                section_entries[section_name] = []
 
         # Add all entries to section_entries
         prev_entry = None
@@ -594,7 +599,7 @@ class LinkerWriter:
         if not noload:
             seg_rom_start = get_segment_rom_start(seg_name)
             line += f" AT({seg_rom_start})"
-        if options.opts.emit_subalign and segment.subalign != None:
+        if options.opts.emit_subalign and segment.subalign is not None:
             line += f" SUBALIGN({segment.subalign})"
 
         self._writeln(line)
@@ -636,7 +641,7 @@ class LinkerWriter:
         if noload:
             line += " (NOLOAD)"
         line += " :"
-        if options.opts.emit_subalign and segment.subalign != None:
+        if options.opts.emit_subalign and segment.subalign is not None:
             line += f" SUBALIGN({segment.subalign})"
 
         self._writeln(line)

{splat64-0.36.1 → splat64-0.36.3}/src/splat/segtypes/n64/gfx.py

@@ -36,7 +36,6 @@ from pygfxd import (
     gfxd_f3dexb,
     gfxd_f3dex2,
 )
-from ..segment import Segment
 
 from ...util import log, options
 from ...util.log import error

{splat64-0.36.1 → splat64-0.36.3}/src/splat/segtypes/segment.py

@@ -56,7 +56,7 @@ def parse_segment_subalign(segment: Union[dict, list]) -> Optional[int]:
     default = options.opts.subalign
     if isinstance(segment, dict):
         subalign = segment.get("subalign", default)
-        if subalign != None:
+        if subalign is not None:
             subalign = int(subalign)
         return subalign
     return default
@@ -101,15 +101,15 @@ class Segment:
 
         if options.opts.allow_segment_overrides:
             segment_class = Segment.get_extension_segment_class(seg_type)
-            if segment_class == None:
+            if segment_class is None:
                 segment_class = Segment.get_base_segment_class(seg_type)
         else:
             segment_class = Segment.get_base_segment_class(seg_type)
-            if segment_class == None:
+            if segment_class is None:
                 # Look in extensions
                 segment_class = Segment.get_extension_segment_class(seg_type)
 
-        if segment_class == None:
+        if segment_class is None:
             log.error(
                 f"could not load segment type '{seg_type}'\n(hint: confirm your extension directory is configured correctly)"
             )
@@ -538,9 +538,9 @@ class Segment:
 
     @property
     def subalign(self) -> Optional[int]:
-        assert (
-            self.parent is None
-        ), f"subalign is not valid for non-top-level segments. ({self})"
+        assert self.parent is None, (
+            f"subalign is not valid for non-top-level segments. ({self})"
+        )
         return self.given_subalign
 
     @property

{splat64-0.36.1 → splat64-0.36.3}/src/splat/util/cache_handler.py

@@ -20,7 +20,7 @@ class Cache:
                     log.write(f"Loaded cache ({len(self.cache.keys())} items)")
             except Exception:
                 log.write(
-                    f"Not able to load cache file. Discarding old cache", status="warn"
+                    "Not able to load cache file. Discarding old cache", status="warn"
                 )
 
         # invalidate entire cache if options change

{splat64-0.36.1 → splat64-0.36.3}/src/splat/util/conf.py

@@ -10,10 +10,10 @@ from typing import Any, Dict, List, Optional
 from pathlib import Path
 
 # This unused import makes the yaml library faster. don't remove
-import pylibyaml  # pyright: ignore
+import pylibyaml  # noqa: F401
 import yaml
 
-from . import log, options, vram_classes
+from . import options, vram_classes
 
 
 def _merge_configs(main_config, additional_config, additional_config_path):
@@ -26,15 +26,15 @@ def _merge_configs(main_config, additional_config, additional_config_path):
     for curkey in additional_config:
         if curkey not in main_config:
             main_config[curkey] = additional_config[curkey]
-        elif type(main_config[curkey]) != type(additional_config[curkey]):
+        elif type(main_config[curkey]) is not type(additional_config[curkey]):
             raise TypeError(
                 f"Could not merge {str(additional_config_path)}: type for key '{curkey}' in configs does not match"
             )
         else:
             # keys exist and match, see if a list to append
-            if type(main_config[curkey]) == list:
+            if type(main_config[curkey]) is list:
                 main_config[curkey] += additional_config[curkey]
-            elif type(main_config[curkey]) == dict:
+            elif type(main_config[curkey]) is dict:
                 # need to merge sub areas
                 main_config[curkey] = _merge_configs(
                     main_config[curkey],