Resolve several Ruff and Mypy warnings

Mostly applying and checking unsafe fixes

Author: HexDecimal

build_libtcod.py

@@ -14,6 +14,8 @@
 
 from cffi import FFI
 
+# ruff: noqa: T201
+
 sys.path.append(str(Path(__file__).parent))  # Allow importing local modules.
 
 import build_sdl
@@ -50,14 +52,14 @@ class ParsedHeader:
 
     def __init__(self, path: Path) -> None:
         """Initialize and organize a header file."""
-        self.path = path = path.resolve(True)
+        self.path = path = path.resolve(strict=True)
         directory = path.parent
         depends = set()
         header = self.path.read_text(encoding="utf-8")
         header = RE_COMMENT.sub("", header)
         header = RE_CPLUSPLUS.sub("", header)
         for dependency in RE_INCLUDE.findall(header):
-            depends.add((directory / str(dependency)).resolve(True))
+            depends.add((directory / str(dependency)).resolve(strict=True))
         header = RE_PREPROCESSOR.sub("", header)
         header = RE_TAGS.sub("", header)
         header = RE_VAFUNC.sub("", header)
@@ -91,7 +93,7 @@ def walk_includes(directory: str) -> Iterator[ParsedHeader]:
             if file in HEADER_PARSE_EXCLUDES:
                 continue
             if file.endswith(".h"):
-                yield ParsedHeader(Path(path, file).resolve(True))
+                yield ParsedHeader(Path(path, file).resolve(strict=True))
 
 
 def resolve_dependencies(

build_sdl.py

@@ -14,11 +14,11 @@
 from pathlib import Path
 from typing import Any
 
-import pcpp  # type: ignore
+import pcpp  # type: ignore[import-untyped]
 import requests
 
 # This script calls a lot of programs.
-# ruff: noqa: S603, S607
+# ruff: noqa: S603, S607, T201
 
 BIT_SIZE, LINKAGE = platform.architecture()
 
@@ -141,7 +141,7 @@ def unpack_sdl2(version: str) -> Path:
     return sdl2_path
 
 
-class SDLParser(pcpp.Preprocessor):  # type: ignore
+class SDLParser(pcpp.Preprocessor):  # type: ignore[misc]
     """A modified preprocessor to output code in a format for CFFI."""
 
     def __init__(self) -> None:
@@ -159,7 +159,7 @@ def get_output(self) -> str:
                 buffer.write(f"#define {name} ...\n")
             return buffer.getvalue()
 
-    def on_include_not_found(self, is_malformed: bool, is_system_include: bool, curdir: str, includepath: str) -> None:
+    def on_include_not_found(self, is_malformed: bool, is_system_include: bool, curdir: str, includepath: str) -> None:  # noqa: ARG002, FBT001
         """Remove bad includes such as stddef.h and stdarg.h."""
         raise pcpp.OutputDirective(pcpp.Action.IgnoreAndRemove)
 
@@ -190,7 +190,7 @@ def on_directive_handle(
         self,
         directive: Any,  # noqa: ANN401
         tokens: list[Any],
-        if_passthru: bool,
+        if_passthru: bool,  # noqa: FBT001
         preceding_tokens: list[Any],
     ) -> Any:  # noqa: ANN401
         """Catch and store definitions."""
@@ -204,7 +204,7 @@ def on_directive_handle(
 
 check_sdl_version()
 
-if sys.platform in ["win32", "darwin"]:
+if sys.platform == "win32" or sys.platform == "darwin":
     SDL2_PARSE_PATH = unpack_sdl2(SDL2_PARSE_VERSION)
     SDL2_BUNDLE_PATH = unpack_sdl2(SDL2_BUNDLE_VERSION)
 

docs/conf.py

@@ -27,6 +27,8 @@
 
 THIS_DIR = Path(__file__).parent
 
+# ruff: noqa: ERA001
+
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -79,7 +81,7 @@
 )
 release = git_describe.stdout.strip()
 assert release
-print("release version: %r" % release)
+print(f"release version: {release!r}")
 
 # The short X.Y version.
 match_version = re.match(r"([0-9]+\.[0-9]+).*?", release)

docs/tcod/getting-started.rst

@@ -55,7 +55,7 @@ integer increments.
                     print(event)  # Print event names and attributes.
                     match event:
                         case tcod.event.Quit():
-                            raise SystemExit()
+                            raise SystemExit
             # The window will be closed after the above with-block exits.
 
 
@@ -113,7 +113,7 @@ clearing the console every frame and replacing it only on resizing the window.
                     print(event)  # Print event names and attributes.
                     match event:
                         case tcod.event.Quit():
-                            raise SystemExit()
+                            raise SystemExit
                         case tcod.event.WindowResized(type="WindowSizeChanged"):
                             pass  # The next call to context.new_console may return a different size.
 

examples/distribution/PyInstaller/main.py

@@ -30,7 +30,7 @@ def main() -> None:
             context.present(console)
             for event in tcod.event.wait():
                 if isinstance(event, tcod.event.Quit):
-                    raise SystemExit()
+                    raise SystemExit
 
 
 if __name__ == "__main__":

examples/distribution/cx_Freeze/main.py

@@ -20,7 +20,7 @@ def main() -> None:
             context.present(console)
             for event in tcod.event.wait():
                 if isinstance(event, tcod.event.Quit):
-                    raise SystemExit()
+                    raise SystemExit
 
 
 if __name__ == "__main__":

examples/eventget.py

@@ -41,7 +41,7 @@ def main() -> None:
                 context.convert_event(event)  # Set tile coordinates for event.
                 print(repr(event))
                 if isinstance(event, tcod.event.Quit):
-                    raise SystemExit()
+                    raise SystemExit
                 if isinstance(event, tcod.event.WindowResized) and event.type == "WindowSizeChanged":
                     console = context.new_console()
                 if isinstance(event, tcod.event.ControllerDevice):

examples/framerate.py

@@ -138,7 +138,7 @@ def main() -> None:
             for event in tcod.event.get():
                 context.convert_event(event)  # Set tile coordinates for event.
                 if isinstance(event, tcod.event.Quit):
-                    raise SystemExit()
+                    raise SystemExit
                 if isinstance(event, tcod.event.MouseWheel):
                     desired_fps = max(1, desired_fps + event.y)
 

examples/samples_tcod.py

@@ -14,10 +14,9 @@
 import time
 import warnings
 from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
-from numpy.typing import NDArray
 
 import tcod.cffi
 import tcod.context
@@ -29,6 +28,9 @@
 from tcod import libtcodpy
 from tcod.sdl.video import WindowFlags
 
+if TYPE_CHECKING:
+    from numpy.typing import NDArray
+
 # ruff: noqa: S311
 
 if not sys.warnoptions:
@@ -96,13 +98,13 @@ def ev_keydown(self, event: tcod.event.KeyDown) -> None:
                 libtcodpy.sys_save_screenshot()
                 print("png")
         elif event.sym == tcod.event.KeySym.ESCAPE:
-            raise SystemExit()
+            raise SystemExit
         elif event.sym in RENDERER_KEYS:
             # Swap the active context for one with a different renderer.
             init_context(RENDERER_KEYS[event.sym])
 
     def ev_quit(self, event: tcod.event.Quit) -> None:
-        raise SystemExit()
+        raise SystemExit
 
 
 class TrueColorSample(Sample):
@@ -307,7 +309,7 @@ def on_draw(self) -> None:
         sample_console.print(
             2,
             2,
-            "%s (ENTER to change)" % self.FLAG_NAMES[self.bk_flag & 0xFF],
+            f"{self.FLAG_NAMES[self.bk_flag & 0xFF]} (ENTER to change)",
             fg=WHITE,
             bg=None,
         )
@@ -431,26 +433,26 @@ def on_draw(self) -> None:
                 sample_console.print(2, 2 + cur_func, text, fg=WHITE, bg=LIGHT_BLUE)
             else:
                 sample_console.print(2, 2 + cur_func, text, fg=GREY, bg=None)
-        sample_console.print(2, 11, "Y/H : zoom (%2.1f)" % self.zoom, fg=WHITE, bg=None)
+        sample_console.print(2, 11, f"Y/H : zoom ({self.zoom:2.1f})", fg=WHITE, bg=None)
         if self.implementation != tcod.noise.Implementation.SIMPLE:
             sample_console.print(
                 2,
                 12,
-                "E/D : hurst (%2.1f)" % self.hurst,
+                f"E/D : hurst ({self.hurst:2.1f})",
                 fg=WHITE,
                 bg=None,
             )
             sample_console.print(
                 2,
                 13,
-                "R/F : lacunarity (%2.1f)" % self.lacunarity,
+                f"R/F : lacunarity ({self.lacunarity:2.1f})",
                 fg=WHITE,
                 bg=None,
             )
             sample_console.print(
                 2,
                 14,
-                "T/G : octaves (%2.1f)" % self.octaves,
+                f"T/G : octaves ({self.octaves:2.1f})",
                 fg=WHITE,
                 bg=None,
             )
@@ -991,7 +993,7 @@ def on_draw(self) -> None:
             walls = "OFF"
             if bsp_room_walls:
                 walls = "ON"
-            sample_console.print(1, 6, "2 : room walls %s" % walls, fg=WHITE, bg=None)
+            sample_console.print(1, 6, f"2 : room walls {walls}", fg=WHITE, bg=None)
         # render the level
         for y in range(SAMPLE_SCREEN_HEIGHT):
             for x in range(SAMPLE_SCREEN_WIDTH):
@@ -1161,7 +1163,7 @@ def on_draw(self) -> None:
         sample_console.print(
             1,
             1,
-            "%s\n\n+ : next generator\n- : prev generator" % self.sets[self.current_set],
+            f"{self.sets[self.current_set]}\n\n+ : next generator\n- : prev generator",
             fg=WHITE,
             bg=None,
         )
@@ -1214,8 +1216,8 @@ def ev_keydown(self, event: tcod.event.KeyDown) -> None:
 
 # the coordinates of all tiles in the screen, as numpy arrays.
 # example: (4x3 pixels screen)
-# xc = [[1, 2, 3, 4], [1, 2, 3, 4], [1, 2, 3, 4]]
-# yc = [[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3]]
+# xc = [[1, 2, 3, 4], [1, 2, 3, 4], [1, 2, 3, 4]]  # noqa: ERA001
+# yc = [[1, 1, 1, 1], [2, 2, 2, 2], [3, 3, 3, 3]]  # noqa: ERA001
 if numpy_available:
     (xc, yc) = np.meshgrid(range(SCREEN_W), range(SCREEN_H))
     # translate coordinates of all pixels to center
@@ -1504,7 +1506,7 @@ def handle_events() -> None:
 
         SAMPLES[cur_sample].dispatch(event)
         if isinstance(event, tcod.event.Quit):
-            raise SystemExit()
+            raise SystemExit
 
 
 def draw_samples_menu() -> None:
@@ -1518,7 +1520,7 @@ def draw_samples_menu() -> None:
         root_console.print(
             2,
             46 - (len(SAMPLES) - i),
-            "  %s" % sample.name.ljust(19),
+            f"  {sample.name.ljust(19)}",
             fg,
             bg,
             alignment=libtcodpy.LEFT,

examples/sdl-hello-world.py

@@ -17,7 +17,7 @@ def render_text(renderer: tcod.sdl.render.Renderer, text: str) -> tcod.sdl.rende
     """Render text, upload it to VRAM, then return it as an SDL Texture."""
     # Use Pillow to render the font.
     _left, _top, right, bottom = font.getbbox(text)
-    width, height = right, bottom
+    width, height = int(right), int(bottom)
     image = Image.new("RGBA", (width, height))
     draw = ImageDraw.Draw(image)
     draw.text((0, 0), text, font=font)
@@ -43,7 +43,7 @@ def main() -> None:
         renderer.present()
         for event in tcod.event.get():
             if isinstance(event, tcod.event.Quit):
-                raise SystemExit()
+                raise SystemExit
 
 
 if __name__ == "__main__":