Trac #21319: fixup due to changes in dependencies

Author: dkrenn

src/sage/combinat/k_regular_sequence.py

@@ -97,7 +97,6 @@
 from .recognizable_series import RecognizableSeries
 from .recognizable_series import RecognizableSeriesSpace
 from sage.misc.cachefunc import cached_method
-from six import iteritems
 
 
 def pad_right(T, length, zero=0):
@@ -409,7 +408,7 @@ def subsequence(self, a, b, minimize=True):
 
         if a == 0:
             return sum(c_j * self[b_j] * self.parent().one_hadamard()
-                       for b_j, c_j in iteritems(b))
+                       for b_j, c_j in b.items())
         elif a == 1 and len(b) == 1 and zero in b:
             return b[zero] * self
         elif a < 0:
@@ -457,7 +456,7 @@ def mu_line(r, i, c):
                  for r in A),
             sum(c_j * vector(
                     pad_right(pad(tuple(self.left), b_j), ndim, zero=zero))
-                for b_j, c_j in iteritems(b)),
+                for b_j, c_j in b.items()),
             vector(sum((tuple(self.__getitem__(c, multiply_left=False))
                         if c >= 0 else dim*(zero,)
                         for c in kernel), tuple())))
@@ -640,7 +639,7 @@ def _pickle_kRegularSequenceSpace(k, coefficients, category):
         sage: Seq2 = kRegularSequenceSpace(2, ZZ)
         sage: from sage.combinat.k_regular_sequence import _pickle_kRegularSequenceSpace
         sage: _pickle_kRegularSequenceSpace(
-        ....:     Seq2.k, Seq2.coefficients(), Seq2.category())
+        ....:     Seq2.k, Seq2.coefficient_ring(), Seq2.category())
         Space of 2-regular sequences over Integer Ring
     """
     return kRegularSequenceSpace(k, coefficients, category=category)
@@ -723,6 +722,7 @@ def __init__(self, k, *args, **kwds):
             running ._test_an_element() . . . pass
             running ._test_cardinality() . . . pass
             running ._test_category() . . . pass
+            running ._test_construction() . . . pass
             running ._test_elements() . . .
               Running the test suite of self.an_element()
               running ._test_category() . . . pass
@@ -762,7 +762,7 @@ def __reduce__(self):
             Space of 2-regular sequences over Integer Ring
         """
         return _pickle_kRegularSequenceSpace, \
-            (self.k, self.coefficients(), self.category())
+            (self.k, self.coefficient_ring(), self.category())
 
     def _repr_(self):
         r"""

src/sage/combinat/recognizable_series.py

@@ -385,7 +385,7 @@ def immutable(m):
             return m
 
         if isinstance(mu, dict):
-            mu = dict((a, immutable(M)) for a, M in iteritems(mu))
+            mu = dict((a, immutable(M)) for a, M in mu.items())
         mu = Family(mu)
 
         if not mu.is_finite():
@@ -875,7 +875,7 @@ def __eq__(self, other):
             sage: Z1 = Rec((Matrix([[1, 0], [0, 1]]), Matrix([[1, 0], [0, 1]])),
             ....:          left=vector([0, 1]), right=vector([1, 0]))
             sage: Z1
-            0
+            0 + ...
             sage: Z2 = Rec((Matrix([[0, 0], [0, 0]]), Matrix([[0, 0], [0, 0]])),
             ....:          left=vector([0, 1]), right=vector([1, 0]))
             sage: Z2
@@ -1411,7 +1411,7 @@ def _pickle_RecognizableSeriesSpace(coefficients, indices, category):
         sage: Rec = RecognizableSeriesSpace(ZZ, [0, 1])
         sage: from sage.combinat.recognizable_series import _pickle_RecognizableSeriesSpace
         sage: _pickle_RecognizableSeriesSpace(
-        ....:     Rec.coefficients(), Rec.indices(), Rec.category())
+        ....:     Rec.coefficient_ring(), Rec.indices(), Rec.category())
         Space of recognizable series on {0, 1} with coefficients in Integer Ring
     """
     return RecognizableSeriesSpace(coefficients, indices=indices, category=category)
@@ -1588,6 +1588,7 @@ def __init__(self, coefficient_ring, indices, category):
             running ._test_an_element() . . . pass
             running ._test_cardinality() . . . pass
             running ._test_category() . . . pass
+            running ._test_construction() . . . pass
             running ._test_elements() . . .
               Running the test suite of self.an_element()
               running ._test_category() . . . pass
@@ -1623,7 +1624,7 @@ def __reduce__(self):
             Space of recognizable series on {0, 1} with coefficients in Integer Ring
         """
         return _pickle_RecognizableSeriesSpace, \
-            (self.coefficients(), self.indices(), self.category())
+            (self.coefficient_ring(), self.indices(), self.category())
 
 
     def alphabet(self):
@@ -1710,9 +1711,9 @@ def _an_element_(self):
         """
         from sage.matrix.constructor import Matrix
         from sage.modules.free_module_element import vector
-        z = self.coefficients().zero()
-        o = self.coefficients().one()
-        e = self.coefficients().an_element()
+        z = self.coefficient_ring().zero()
+        o = self.coefficient_ring().one()
+        e = self.coefficient_ring().an_element()
         return self(list(Matrix([[o, z], [i*o, o]])
                          for i, _ in enumerate(self.alphabet())),
                     vector([z, e]), right=vector([e, z]))
@@ -1733,25 +1734,24 @@ def some_elements(self):
             sage: tuple(RecognizableSeriesSpace(ZZ, [0, 1]).some_elements())
             ([1] + [01] + [10] + 2*[11] + [001] + [010]
                  + 2*[011] + [100] + 2*[101] + 2*[110] + ...,
-             [] + [0] + [1] + [00] + [01] + [10]
-                + [11] + [000] + [001] + [010] + ...,
-             0,
-             -2*[] + 2*[0] - 4*[1] - 2*[00] + 4*[01] + 4*[10]
-                   - 8*[11] + 2*[000] - 4*[001] - 4*[010] + ...,
-             [] + [0] + 2*[1] + [00] + 2*[01] + [10]
-                + 4*[11] + [000] + 2*[001] + [010] + ...,
-             2*[] + 5*[0] + 11*[1] + 8*[00] + 14*[01] + 14*[10]
-                  + 20*[11] + 11*[000] + 17*[001] + 17*[010] + ...,
+             [] + [1] + [11] + [111] + [1111] + [11111] + [111111] + ...,
+             [] + [0] + [1] + [00] + [10] + [11]
+                + [000] - 1*[001] + [100] + [110] + ...,
+             2*[] - 1*[1] + 2*[10] - 1*[101]
+                  + 2*[1010] - 1*[10101] + 2*[101010] + ...,
+             [] + [1] + 6*[00] + [11] - 39*[000] + 5*[001] + 6*[100] + [111]
+                + 288*[0000] - 33*[0001] + ...,
+             -5*[] + ...,
              ...
-             [] + [0] + 10*[1] + [00] + 10*[01] + [10]
-                + 100*[11] + [000] + 10*[001] + [010] + ...)
+             210*[] + ...,
+             2210*[] - 170*[0] + 170*[1] + ...)
         """
         from itertools import count, islice
         from sage.matrix.matrix_space import MatrixSpace
         from sage.modules.free_module import FreeModule
         yield self.an_element()
 
-        C = self.coefficients()
+        C = self.coefficient_ring()
         some_elements_base = iter(C.some_elements())
         k = len(self.alphabet())
         for dim in range(1, 11):