Rename tcod.loader to tcod.cffi.

Should be a better name since this is where the cffi API is exported from.

Author: HexDecimal

tcod/__init__.py

@@ -14,10 +14,10 @@
 __path__ = extend_path(__path__, __name__)
 
 from tcod import bsp, color, console, constants, context, event, image, los, map, noise, path, random, tileset
+from tcod.cffi import __sdl_version__, ffi, lib
 from tcod.console import Console
 from tcod.constants import *  # noqa: F403
 from tcod.libtcodpy import *  # noqa: F403
-from tcod.loader import __sdl_version__, ffi, lib
 from tcod.version import __version__
 
 

tcod/_internal.py

@@ -10,7 +10,7 @@
 from numpy.typing import ArrayLike, NDArray
 from typing_extensions import Literal
 
-from tcod.loader import ffi, lib
+from tcod.cffi import ffi, lib
 
 FuncType = Callable[..., Any]
 F = TypeVar("F", bound=FuncType)

tcod/bsp.py

@@ -30,7 +30,7 @@
 
 import tcod.random
 from tcod._internal import deprecate
-from tcod.loader import ffi, lib
+from tcod.cffi import ffi, lib
 
 
 class BSP:

tcod/loader.py tcod/cffi.pytcod/loader.py renamed to tcod/cffi.py

@@ -64,7 +64,7 @@ def get_sdl_version() -> str:
 
 
 @ffi.def_extern()  # type: ignore
-def _libtcod_log_watcher(message: Any, userdata: None) -> None:
+def _libtcod_log_watcher(message: Any, userdata: None) -> None:  # noqa: ANN401
     text = str(ffi.string(message.message), encoding="utf-8")
     source = str(ffi.string(message.source), encoding="utf-8")
     level = int(message.level)

tcod/color.py

@@ -5,7 +5,7 @@
 from typing import Any, List
 
 from tcod._internal import deprecate
-from tcod.loader import lib
+from tcod.cffi import lib
 
 
 class Color(List[int]):

tcod/console.py

@@ -16,7 +16,7 @@
 import tcod._internal
 import tcod.constants
 from tcod._internal import _check, deprecate
-from tcod.loader import ffi, lib
+from tcod.cffi import ffi, lib
 
 
 def _fmt(string: str) -> bytes:

tcod/context.py

@@ -65,7 +65,7 @@
 import tcod.sdl.video
 import tcod.tileset
 from tcod._internal import _check, _check_warn, pending_deprecate
-from tcod.loader import ffi, lib
+from tcod.cffi import ffi, lib
 
 __all__ = (
     "Context",

tcod/event.py

@@ -91,9 +91,9 @@
 
 import tcod.event_constants
 import tcod.sdl.joystick
+from tcod.cffi import ffi, lib
 from tcod.event_constants import *  # noqa: F403
 from tcod.event_constants import KMOD_ALT, KMOD_CTRL, KMOD_GUI, KMOD_SHIFT
-from tcod.loader import ffi, lib
 from tcod.sdl.joystick import _HAT_DIRECTIONS
 
 T = TypeVar("T")

tcod/image.py

@@ -19,7 +19,7 @@
 
 import tcod.console
 from tcod._internal import _console, deprecate
-from tcod.loader import ffi, lib
+from tcod.cffi import ffi, lib
 
 
 class Image:

tcod/libtcodpy.py

@@ -36,6 +36,7 @@
     deprecate,
     pending_deprecate,
 )
+from tcod.cffi import ffi, lib
 from tcod.color import Color
 from tcod.constants import *  # noqa: F403
 from tcod.constants import (
@@ -49,7 +50,6 @@
     KEY_RELEASED,
     NOISE_DEFAULT,
 )
-from tcod.loader import ffi, lib
 
 # ruff: noqa: ANN401 PLR0913  # Functions are too deprecated to make changes.