Merged branch

sagemath · Aug 9, 2021 · 8d6ac7b · 8d6ac7b
2 parents cd9da2a + 664e35a
commit 8d6ac7b
Show file tree

Hide file tree

Showing 11 changed files with 2,478 additions and 914 deletions.
diff --git a/src/doc/en/reference/data_structures/index.rst b/src/doc/en/reference/data_structures/index.rst
@@ -7,6 +7,7 @@ Data Structures
    sage/misc/binary_tree
    sage/data_structures/bitset
    sage/data_structures/bounded_integer_sequences
+   sage/data_structures/coefficient_stream
    sage/data_structures/mutable_poset
 
 .. include:: ../footer.txt
diff --git a/src/doc/en/reference/power_series/index.rst b/src/doc/en/reference/power_series/index.rst
@@ -17,7 +17,6 @@ Power Series Rings and Laurent Series Rings
 
    sage/rings/lazy_laurent_series
    sage/rings/lazy_laurent_series_ring
-   sage/rings/lazy_laurent_series_operator
 
    sage/rings/puiseux_series_ring
    sage/rings/puiseux_series_ring_element

diff --git a/src/sage/categories/unital_algebras.py b/src/sage/categories/unital_algebras.py
@@ -224,7 +224,7 @@ def _coerce_map_from_base_ring(self):
             if from_base_ring.__func__ != generic_from_base_ring:
                 # Custom from_base_ring()
                 use_from_base_ring = True
-            if isinstance(generic_from_base_ring, lazy_attribute):
+            elif isinstance(generic_from_base_ring, lazy_attribute):
                 # If the category implements from_base_ring() as lazy
                 # attribute, then we always use it.
                 # This is for backwards compatibility, see Trac #25181