From dbd32e196e8a739bd81c1a1554d50e3b37fcc63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Chapoton?= Date: Sun, 4 Jan 2026 20:17:14 +0100 Subject: [PATCH] remove deprecated stuff in monoids/ --- src/sage/monoids/free_abelian_monoid.py | 29 +---------- src/sage/monoids/free_monoid.py | 32 ------------ src/sage/monoids/free_monoid_element.py | 10 +--- src/sage/monoids/monoid.py | 31 +----------- src/sage/monoids/string_monoid_element.py | 60 +---------------------- 5 files changed, 5 insertions(+), 157 deletions(-) diff --git a/src/sage/monoids/free_abelian_monoid.py b/src/sage/monoids/free_abelian_monoid.py index 77da79e29cb..d1fa5bff1b8 100644 --- a/src/sage/monoids/free_abelian_monoid.py +++ b/src/sage/monoids/free_abelian_monoid.py @@ -156,38 +156,13 @@ def FreeAbelianMonoid(index_set=None, names=None, **kwds): return FreeAbelianMonoid_factory(index_set, names) -def is_FreeAbelianMonoid(x): - """ - Return ``True`` if `x` is a free abelian monoid. - - EXAMPLES:: - - sage: from sage.monoids.free_abelian_monoid import is_FreeAbelianMonoid - sage: is_FreeAbelianMonoid(5) - doctest:warning... - DeprecationWarning: the function is_FreeAbelianMonoid is deprecated; - use 'isinstance(..., FreeAbelianMonoid_class)' instead - See https://github.com/sagemath/sage/issues/37897 for details. - False - sage: is_FreeAbelianMonoid(FreeAbelianMonoid(7,'a')) - True - sage: is_FreeAbelianMonoid(FreeMonoid(7,'a')) - False - sage: is_FreeAbelianMonoid(FreeMonoid(0,'')) - False - """ - from sage.misc.superseded import deprecation - deprecation(37897, "the function is_FreeAbelianMonoid is deprecated; use 'isinstance(..., FreeAbelianMonoid_class)' instead") - return isinstance(x, FreeAbelianMonoid_class) - - class FreeAbelianMonoid_class(Parent): """ Free abelian monoid on `n` generators. """ Element = FreeAbelianMonoidElement - def __init__(self, n, names): + def __init__(self, n, names) -> None: """ Initialize ``self``. @@ -204,7 +179,7 @@ def __init__(self, n, names): assert names is not None Parent.__init__(self, names=names, category=Monoids().Commutative()) - def __repr__(self): + def __repr__(self) -> str: n = self.__ngens return f"Free abelian monoid on {n} generators {self.gens()}" diff --git a/src/sage/monoids/free_monoid.py b/src/sage/monoids/free_monoid.py index e5efbf477e7..108b91f97c6 100644 --- a/src/sage/monoids/free_monoid.py +++ b/src/sage/monoids/free_monoid.py @@ -35,38 +35,6 @@ from sage.structure.unique_representation import UniqueRepresentation -def is_FreeMonoid(x): - """ - Return ``True`` if `x` is a free monoid. - - EXAMPLES:: - - sage: from sage.monoids.free_monoid import is_FreeMonoid - sage: is_FreeMonoid(5) - doctest:warning... - DeprecationWarning: the function is_FreeMonoid is deprecated; - use 'isinstance(..., (FreeMonoid, IndexedFreeMonoid))' instead - See https://github.com/sagemath/sage/issues/37897 for details. - False - sage: is_FreeMonoid(FreeMonoid(7,'a')) - True - sage: is_FreeMonoid(FreeAbelianMonoid(7,'a')) - False - sage: is_FreeMonoid(FreeAbelianMonoid(0,'')) - False - sage: is_FreeMonoid(FreeMonoid(index_set=ZZ)) - True - sage: is_FreeMonoid(FreeAbelianMonoid(index_set=ZZ)) - False - """ - from sage.misc.superseded import deprecation - deprecation(37897, "the function is_FreeMonoid is deprecated; use 'isinstance(..., (FreeMonoid, IndexedFreeMonoid))' instead") - if isinstance(x, FreeMonoid): - return True - from sage.monoids.indexed_free_monoid import IndexedFreeMonoid - return isinstance(x, IndexedFreeMonoid) - - class FreeMonoid(Monoid_class, UniqueRepresentation): r""" Return a free monoid on `n` generators or with the generators diff --git a/src/sage/monoids/free_monoid_element.py b/src/sage/monoids/free_monoid_element.py index f378270fcfd..eb425cdfda4 100644 --- a/src/sage/monoids/free_monoid_element.py +++ b/src/sage/monoids/free_monoid_element.py @@ -30,14 +30,6 @@ from sage.rings.semirings.non_negative_integer_semiring import NN -def is_FreeMonoidElement(x): - from sage.misc.superseded import deprecation - deprecation(38184, - "The function is_FreeMonoidElement is deprecated; " - "use 'isinstance(..., FreeMonoidElement)' instead.") - return isinstance(x, FreeMonoidElement) - - class FreeMonoidElement(MonoidElement): """ Element of a free monoid. @@ -55,7 +47,7 @@ class FreeMonoidElement(MonoidElement): ... NotImplementedError """ - def __init__(self, F, x, check=True): + def __init__(self, F, x, check=True) -> None: """ Create the element `x` of the FreeMonoid `F`. diff --git a/src/sage/monoids/monoid.py b/src/sage/monoids/monoid.py index ff80fbc0a54..5a59aacc318 100644 --- a/src/sage/monoids/monoid.py +++ b/src/sage/monoids/monoid.py @@ -7,37 +7,8 @@ from sage.misc.cachefunc import cached_method -def is_Monoid(x) -> bool: - r""" - Return ``True`` if ``x`` is of type ``Monoid_class``. - - EXAMPLES:: - - sage: from sage.monoids.monoid import is_Monoid - sage: is_Monoid(0) - doctest:warning... - DeprecationWarning: the function is_Monoid is deprecated; - use 'isinstance(..., Monoid_class)' instead - See https://github.com/sagemath/sage/issues/37897 for details. - False - sage: is_Monoid(ZZ) # The technical math meaning of monoid has - ....: # no bearing whatsoever on the result: it's - ....: # a typecheck which is not satisfied by ZZ - ....: # since it does not inherit from Monoid_class. - False - sage: is_Monoid(sage.monoids.monoid.Monoid_class(('a','b'))) - True - sage: F. = FreeMonoid(5) - sage: is_Monoid(F) - True - """ - from sage.misc.superseded import deprecation - deprecation(37897, "the function is_Monoid is deprecated; use 'isinstance(..., Monoid_class)' instead") - return isinstance(x, Monoid_class) - - class Monoid_class(Parent): - def __init__(self, names, category=None): + def __init__(self, names, category=None) -> None: r""" EXAMPLES:: diff --git a/src/sage/monoids/string_monoid_element.py b/src/sage/monoids/string_monoid_element.py index e5d447bbee9..fde2e9f40db 100644 --- a/src/sage/monoids/string_monoid_element.py +++ b/src/sage/monoids/string_monoid_element.py @@ -29,70 +29,12 @@ from .free_monoid_element import FreeMonoidElement -def is_StringMonoidElement(x): - from sage.misc.superseded import deprecation - deprecation(38280, - "The function is_StringMonoidElement is deprecated; " - "use 'isinstance(..., StringMonoidElement)' instead.") - return isinstance(x, StringMonoidElement) - - -def is_AlphabeticStringMonoidElement(x): - from sage.misc.superseded import deprecation - deprecation(38280, - "The function is_AlphabeticStringMonoidElement is deprecated; " - "use 'isinstance(..., StringMonoidElement) and isinstance(x.parent(), AlphabeticStringMonoid)' instead.") - from .string_monoid import AlphabeticStringMonoid - return isinstance(x, StringMonoidElement) and \ - isinstance(x.parent(), AlphabeticStringMonoid) - - -def is_BinaryStringMonoidElement(x): - from sage.misc.superseded import deprecation - deprecation(38280, - "The function is_BinaryStringMonoidElement is deprecated; " - "use 'isinstance(..., StringMonoidElement) and isinstance(x.parent(), BinaryStringMonoid)' instead.") - from .string_monoid import BinaryStringMonoid - return isinstance(x, StringMonoidElement) and \ - isinstance(x.parent(), BinaryStringMonoid) - - -def is_OctalStringMonoidElement(x): - from sage.misc.superseded import deprecation - deprecation(38280, - "The function is_OctalStringMonoidElement is deprecated; " - "use 'isinstance(..., StringMonoidElement) and isinstance(x.parent(), OctalStringMonoid)' instead.") - from .string_monoid import OctalStringMonoid - return isinstance(x, StringMonoidElement) and \ - isinstance(x.parent(), OctalStringMonoid) - - -def is_HexadecimalStringMonoidElement(x): - from sage.misc.superseded import deprecation - deprecation(38280, - "The function is_HexadecimalStringMonoidElement is deprecated; " - "use 'isinstance(..., StringMonoidElement) and isinstance(x.parent(), HexadecimalStringMonoid)' instead.") - from .string_monoid import HexadecimalStringMonoid - return isinstance(x, StringMonoidElement) and \ - isinstance(x.parent(), HexadecimalStringMonoid) - - -def is_Radix64StringMonoidElement(x): - from sage.misc.superseded import deprecation - deprecation(38280, - "The function is_Radix64StringMonoidElement is deprecated; " - "use 'isinstance(..., StringMonoidElement) and isinstance(x.parent(), Radix64StringMonoid)' instead.") - from .string_monoid import Radix64StringMonoid - return isinstance(x, StringMonoidElement) and \ - isinstance(x.parent(), Radix64StringMonoid) - - class StringMonoidElement(FreeMonoidElement): """ Element of a free string monoid. """ - def __init__(self, S, x, check=True): + def __init__(self, S, x, check=True) -> None: """ Create the element ``x`` of the StringMonoid ``S``.