remove deprecation from 26307

Author: fchapoton

src/sage/combinat/words/morphism.py

@@ -568,7 +568,7 @@ def __ne__(self, other):
         """
         return not self == other
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         r"""
         Return the string representation of the morphism.
 
@@ -587,7 +587,7 @@ def __repr__(self):
         """
         return "WordMorphism: %s" % str(self)
 
-    def __str__(self):
+    def __str__(self) -> str:
         r"""
         Return the morphism in str.
 
@@ -625,7 +625,7 @@ def __str__(self):
              for lettre, image in self._morph.items()]
         return ', '.join(sorted(L))
 
-    def __call__(self, w, order=1, datatype=None):
+    def __call__(self, w, order=1):
         r"""
         Return the image of ``w`` under self to the given order.
 
@@ -635,8 +635,6 @@ def __call__(self, w, order=1, datatype=None):
 
         -  ``order`` - integer or plus ``Infinity`` (default: 1)
 
-        - ``datatype`` - deprecated
-
         OUTPUT:
 
         -  ``word`` - order-th iterated image under self of ``w``
@@ -752,7 +750,7 @@ def __call__(self, w, order=1, datatype=None):
             sage: m('')
             word:
 
-        The default datatype when the input is a finite word is another
+        When the input is a finite word, the output is another
         finite word::
 
             sage: w = m('aabb')
@@ -764,49 +762,7 @@ def __call__(self, w, order=1, datatype=None):
             sage: import tempfile
             sage: with tempfile.NamedTemporaryFile(suffix=".sobj") as f:
             ....:     save(w, filename=f.name)
-
-        The ``datatype`` argument is deprecated::
-
-            sage: m = WordMorphism('a->ab,b->ba')
-            sage: w = m('aaab',datatype='list')
-            doctest:warning
-            ...
-            DeprecationWarning: the "datatype" argument is deprecated
-            See https://github.com/sagemath/sage/issues/26307 for details.
-
-            sage: type(w)
-            <class 'sage.combinat.words.word.FiniteWord_list'>
-            sage: w = m('aaab',datatype='str')
-            sage: type(w)
-            <class 'sage.combinat.words.word.FiniteWord_str'>
-            sage: w = m('aaab',datatype='tuple')
-            sage: type(w)
-            <class 'sage.combinat.words.word.FiniteWord_tuple'>
-
-        To use str datatype for the output word, the domain and codomain
-        alphabet must consist of str objects::
-
-            sage: m = WordMorphism({0:[0,1],1:[1,0]})
-            sage: w = m([0],4); type(w)
-            <class 'sage.combinat.words.word.FiniteWord_char'>
-            sage: w = m([0],4,datatype='list')
-            doctest:warning
-            ...
-            DeprecationWarning: the "datatype" argument is deprecated
-            See https://github.com/sagemath/sage/issues/26307 for details.
-            sage: type(w)
-            <class 'sage.combinat.words.word.FiniteWord_list'>
-            sage: w = m([0],4,datatype='str')
-            Traceback (most recent call last):
-            ...
-            ValueError: 0 not in alphabet
-            sage: w = m([0],4,datatype='tuple'); type(w)
-            <class 'sage.combinat.words.word.FiniteWord_tuple'>
         """
-        if datatype is not None:
-            from sage.misc.superseded import deprecation
-            deprecation(26307, 'the "datatype" argument is deprecated')
-
         if order == 1:
             D = self.domain()
             C = self.codomain()
@@ -817,10 +773,7 @@ def __call__(self, w, order=1, datatype=None):
                 im = C()
                 for a in w:
                     im += self._morph[a]
-                if datatype is not None:
-                    return C(im, datatype=datatype)
-                else:
-                    return im
+                return im
 
             if isinstance(w, Iterable):
                 pass
@@ -853,7 +806,7 @@ def __call__(self, w, order=1, datatype=None):
             return self.fixed_point(letter=letter)
 
         elif isinstance(order, (int, Integer)) and order > 1:
-            return self(self(w, order - 1), datatype=datatype)
+            return self(self(w, order - 1))
 
         elif order == 0:
             return self._domain(w)