typ: remove references to Self in base classes

Author: oscarbenjamin

src/flint/flint_base/flint_base.pyi

@@ -36,13 +36,13 @@ class flint_scalar(flint_elem):
     def is_zero(self) -> bool: ...
     def __pos__(self) -> Self: ...
     def __neg__(self) -> Self: ...
-    def __add__(self, other: Self | int, /) -> Self: ...
+    def __add__(self, other: int, /) -> Self: ...
     def __radd__(self, other: int, /) -> Self: ...
-    def __sub__(self, other: Self | int, /) -> Self: ...
+    def __sub__(self, other: int, /) -> Self: ...
     def __rsub__(self, other: int, /) -> Self: ...
-    def __mul__(self, other: Self | int, /) -> Self: ...
+    def __mul__(self, other: int, /) -> Self: ...
     def __rmul__(self, other: int, /) -> Self: ...
-    def __truediv__(self, other: Self | int, /) -> Self: ...
+    def __truediv__(self, other: int, /) -> Self: ...
     def __rtruediv__(self, other: int, /) -> Self: ...
     def __pow__(self, other: int, /) -> Self: ...
     def __rpow__(self, other: int, /) -> Self: ...
@@ -58,25 +58,22 @@ class flint_poly(flint_elem, Generic[Telem]):
     def length(self) -> int: ...
     def degree(self) -> int: ...
     def coeffs(self) -> list[Telem]: ...
-    @overload
     def __call__(self, other: Telem | int, /) -> Telem: ...
-    @overload
-    def __call__(self, other: Self, /) -> Self: ...
     def __pos__(self) -> Self: ...
     def __neg__(self) -> Self: ...
-    def __add__(self, other: Telem | int | Self, /) -> Self: ...
+    def __add__(self, other: Telem | int, /) -> Self: ...
     def __radd__(self, other: Telem | int, /) -> Self: ...
-    def __sub__(self, other: Telem | int | Self, /) -> Self: ...
+    def __sub__(self, other: Telem | int, /) -> Self: ...
     def __rsub__(self, other: Telem | int, /) -> Self: ...
-    def __mul__(self, other: Telem | int | Self, /) -> Self: ...
+    def __mul__(self, other: Telem | int, /) -> Self: ...
     def __rmul__(self, other: Telem | int, /) -> Self: ...
-    def __truediv__(self, other: Telem | int | Self, /) -> Self: ...
+    def __truediv__(self, other: Telem | int, /) -> Self: ...
     def __rtruediv__(self, other: Telem | int, /) -> Self: ...
-    def __floordiv__(self, other: Telem | int | Self, /) -> Self: ...
+    def __floordiv__(self, other: Telem | int, /) -> Self: ...
     def __rfloordiv__(self, other: Telem | int, /) -> Self: ...
-    def __mod__(self, other: Telem | int | Self, /) -> Self: ...
+    def __mod__(self, other: Telem | int, /) -> Self: ...
     def __rmod__(self, other: Telem | int, /) -> Self: ...
-    def __divmod__(self, other: Telem | int | Self, /) -> tuple[Self, Self]: ...
+    def __divmod__(self, other: Telem | int, /) -> tuple[Self, Self]: ...
     def __rdivmod__(self, other: Telem | int, /) -> tuple[Self, Self]: ...
     def __pow__(self, other: int, /) -> Self: ...
     def is_zero(self) -> bool: ...
@@ -130,41 +127,38 @@ class flint_mpoly(flint_elem, Generic[Tctx, Telem, Telem_coerce]):
     def coeffs(self) -> list[Telem]: ...
     def __pos__(self) -> Self: ...
     def __neg__(self) -> Self: ...
-    def __add__(self, other: Self | Telem | Telem_coerce | int) -> Self: ...
+    def __add__(self, other: Telem | Telem_coerce | int) -> Self: ...
     def __radd__(self, other: Telem | Telem_coerce | int) -> Self: ...
-    def __sub__(self, other: Self | Telem | Telem_coerce | int) -> Self: ...
+    def __sub__(self, other: Telem | Telem_coerce | int) -> Self: ...
     def __rsub__(self, other: Telem | Telem_coerce | int) -> Self: ...
-    def __mul__(self, other: Self | Telem | Telem_coerce | int) -> Self: ...
+    def __mul__(self, other: Telem | Telem_coerce | int) -> Self: ...
     def __rmul__(self, other: Telem | Telem_coerce | int) -> Self: ...
-    def __truediv__(self, other: Self | Telem | Telem_coerce | int) -> Self: ...
+    def __truediv__(self, other: Telem | Telem_coerce | int) -> Self: ...
     def __rtruediv__(self, other: Telem | Telem_coerce | int) -> Self: ...
-    def __floordiv__(self, other: Self | Telem | Telem_coerce | int) -> Self: ...
+    def __floordiv__(self, other: Telem | Telem_coerce | int) -> Self: ...
     def __rfloordiv__(self, other: Telem | Telem_coerce | int) -> Self: ...
-    def __mod__(self, other: Self | Telem | Telem_coerce | int) -> Self: ...
+    def __mod__(self, other: Telem | Telem_coerce | int) -> Self: ...
     def __rmod__(self, other: Telem | Telem_coerce | int) -> Self: ...
     def __divmod__(
-        self, other: Self | Telem | Telem_coerce | int
+        self, other: Telem | Telem_coerce | int
     ) -> tuple[Self, Self]: ...
     def __rdivmod__(self, other: Telem | Telem_coerce | int) -> tuple[Self, Self]: ...
     def __pow__(self, other: Telem | Telem_coerce | int) -> Self: ...
     def __rpow__(self, other: Telem | Telem_coerce | int) -> Self: ...
     def iadd(self, other: Telem | Telem_coerce | int) -> None: ...
     def isub(self, other: Telem | Telem_coerce | int) -> None: ...
     def imul(self, other: Telem | Telem_coerce | int) -> None: ...
-    def gcd(self, other: Self) -> Self: ...
     def term_content(self) -> Self: ...
     def factor(self) -> tuple[Telem, Sequence[tuple[Self, int]]]: ...
     def factor_squarefree(self) -> tuple[Telem, Sequence[tuple[Self, int]]]: ...
     def sqrt(self) -> Self: ...
-    def resultant(self, other: Self, var: _str | int) -> Self: ...
     def discriminant(self, var: _str | int) -> Self: ...
     def deflation_index(self) -> tuple[list[int], list[int]]: ...
     def deflation(self) -> tuple[Self, list[int]]: ...
     def deflation_monom(self) -> tuple[Self, list[int], Self]: ...
     def inflate(self, N: list[int]) -> Self: ...
     def deflate(self, N: list[int]) -> Self: ...
     def subs(self, mapping: dict[_str | int, Telem | Telem_coerce | int]) -> Self: ...
-    def compose(self, *args: Self, ctx: Tctx | None = None) -> Self: ...
     def __call__(self, *args: Telem | Telem_coerce) -> Telem: ...
     def derivative(self, var: _str | int) -> Self: ...
     def unused_gens(self) -> tuple[_str, ...]: ...

src/flint/test/test_all.py

@@ -2622,7 +2622,7 @@ def _all_polys() -> list[tuple[Any, Any, bool, flint.fmpz]]:
 
 
 Tpoly = TypeVar("Tpoly", bound=typ.epoly_p)
-Tc = TypeVar("Tc", bound=flint_base.flint_scalar)
+Tc = TypeVar("Tc", bound=typ.scalar_p)
 TS = Callable[[Tc | int], Tc]
 TP = Callable[[Tpoly | Sequence[Tc | int] | Tc | int], Tpoly]
 _PolyTestCase = tuple[TP[Tpoly,Tc], TS[Tc], bool, flint.fmpz]

src/flint/typing.py

@@ -251,7 +251,7 @@ def infer_generator_mapping(
     @classmethod
     def from_context(
         cls,
-        ctx: flint_mpoly_context,
+        ctx: flint_mpoly_context, # make a protocol for this?
         names: str | Iterable[str | tuple[str, int]] | tuple[str, int] | None = None,
         ordering: Ordering | str = Ordering.lex,
     ) -> Self: ...