address 3.13 deprecations

Author: KotlinIsland

basedtyping/__init__.py

@@ -44,7 +44,9 @@
 
 
 if not TYPE_CHECKING:
-    if sys.version_info >= (3, 11):
+    if sys.version_info >= (3, 13):
+        from typing import _collect_type_parameters as _collect_parameters
+    elif sys.version_info >= (3, 11):
         from typing import _collect_parameters
     else:
         from typing import _collect_type_vars as _collect_parameters
@@ -809,13 +811,17 @@ class A(Base):
                 if value is None:  # type: ignore[no-any-expr]
                     value = type(None)
                 if isinstance(value, str):  # type: ignore[no-any-expr]
-                    if sys.version_info < (3, 9):
-                        value = ForwardRef(value, is_argument=False)
-                    else:
-                        value = ForwardRef(value, is_argument=False, is_class=True)
-                value = typing._eval_type(value, base_globals, base_locals, recursive_guard=1)  # type: ignore[attr-defined, no-any-expr]
+                    value = ForwardRef(value, is_argument=False, is_class=True)
+                if sys.version_info < (3, 12):
+                    value = typing._eval_type(value, base_globals, base_locals)  # type: ignore[attr-defined, no-any-expr]
+                else:
+                    value = typing._eval_type(  # type: ignore[attr-defined]
+                        value,  # type: ignore[no-any-expr]
+                        base_globals,  # type: ignore[no-any-expr]
+                        base_locals,  # type: ignore[no-any-expr]
+                        base.__type_params__,
+                    )
                 hints[name] = value  # type: ignore[no-any-expr]
-
         return hints if include_extras else {k: _strip_annotations(t) for k, t in hints.items()}  # type: ignore[no-any-expr]
 
     if globalns is None:
@@ -836,8 +842,9 @@ class A(Base):
         # Return empty annotations for something that _could_ have them.
         if isinstance(obj, typing._allowed_types):  # type: ignore[ unreachable]
             return {}
-        raise TypeError(f"{obj!r} is not a module, class, method, " "or function.")
+        raise TypeError(f"{obj!r} is not a module, class, method, or function.")
     hints = dict(hints)  # type: ignore[no-any-expr]
+    type_params = getattr(obj, "__type_params__", ())  # type: ignore[no-any-expr]
     for name, value in hints.items():  # type: ignore[no-any-expr]
         if value is None:  # type: ignore[no-any-expr]
             value = type(None)
@@ -849,5 +856,8 @@ class A(Base):
                 is_argument=not isinstance(cast(object, obj), types.ModuleType),
                 is_class=False,
             )
-        hints[name] = typing._eval_type(value, globalns, localns)  # type: ignore[no-any-expr, attr-defined]
+        if sys.version_info >= (3, 12):
+            hints[name] = typing._eval_type(value, globalns, localns, type_params=type_params)  # type: ignore[no-any-expr, attr-defined]
+        else:
+            hints[name] = typing._eval_type(value, globalns, localns)  # type: ignore[no-any-expr, attr-defined]
     return hints if include_extras else {k: _strip_annotations(t) for k, t in hints.items()}  # type: ignore[no-any-expr]

pyproject.toml

@@ -32,7 +32,7 @@ always_false = ["BASEDMYPY_TYPE_CHECKING"]
 skip-magic-trailing-comma = true
 
 [tool.pytest.ini_options]
-addopts = "--import-mode=importlib"
+filterwarnings = "error"
 xfail_strict = true
 
 [tool.ruff]