Revert "Make FiniteFamily a Python subclass of FiniteFamily_base - so that EnumeratedSets mixins work correctly"

This reverts commit 450f9c6.

Author: Matthias Koeppe

src/sage/numerical/mip.pxd

@@ -3,7 +3,7 @@ cdef extern from *:
     cdef int REAL = -1
     cdef int INTEGER = 0
 
-from sage.sets.family cimport FiniteFamily_base
+from sage.sets.family cimport FiniteFamily
 from sage.structure.sage_object cimport SageObject
 from sage.numerical.backends.generic_backend cimport GenericBackend
 
@@ -29,7 +29,7 @@ cdef class MixedIntegerLinearProgram(SageObject):
     cpdef sum(self, L) noexcept
 
 
-cdef class MIPVariable(FiniteFamily_base):
+cdef class MIPVariable(FiniteFamily):
     cdef MixedIntegerLinearProgram _p
     cdef int _vtype
     cdef str _name

src/sage/numerical/mip.pyx

@@ -3237,7 +3237,7 @@ class MIPSolverException(RuntimeError):
     pass
 
 
-cdef class MIPVariable(FiniteFamily_base):
+cdef class MIPVariable(FiniteFamily):
     r"""
     ``MIPVariable`` is a variable used by the class
     ``MixedIntegerLinearProgram``.

src/sage/sets/family.pxd

@@ -5,6 +5,6 @@ cdef class AbstractFamily(Parent):
     cdef public __custom_name
 
 
-cdef class FiniteFamily_base(AbstractFamily):
+cdef class FiniteFamily(AbstractFamily):
     cdef public dict _dictionary
     cdef public object _keys

src/sage/sets/family.pyx

@@ -540,10 +540,48 @@ cdef class AbstractFamily(Parent):
 
 
 
-cdef class FiniteFamily_base(AbstractFamily):
+cdef class FiniteFamily(AbstractFamily):
     r"""
-    Cython base class for :class:`FiniteFamily`.
+    A :class:`FiniteFamily` is an associative container which models a finite
+    family `(f_i)_{i \in I}`. Its elements `f_i` are therefore its
+    values. Instances should be created via the :func:`Family` factory. See its
+    documentation for examples and tests.
+
+    EXAMPLES:
+
+    We define the family `(f_i)_{i \in \{3,4,7\}}` with `f_3=a`,
+    `f_4=b`, and `f_7=d`::
+
+        sage: from sage.sets.family import FiniteFamily
+        sage: f = FiniteFamily({3: 'a', 4: 'b', 7: 'd'})
+
+    Individual elements are accessible as in a usual dictionary::
+
+        sage: f[7]
+        'd'
+
+    And the other usual dictionary operations are also available::
+
+        sage: len(f)
+        3
+        sage: f.keys()
+        [3, 4, 7]
+
+    However f behaves as a container for the `f_i`'s::
+
+        sage: list(f)
+        ['a', 'b', 'd']
+        sage: [ x for x in f ]
+        ['a', 'b', 'd']
+
+    The order of the elements can be specified using the ``keys`` optional argument::
+
+        sage: f = FiniteFamily({"a": "aa", "b": "bb", "c" : "cc" }, keys = ["c", "a", "b"])
+        sage: list(f)
+        ['cc', 'aa', 'bb']
+
     """
+
     def __init__(self, dictionary, keys=None):
         """
         TESTS::
@@ -679,8 +717,8 @@ cdef class FiniteFamily_base(AbstractFamily):
             False
         """
         return (isinstance(other, self.__class__) and
-                self._keys == (<FiniteFamily_base> other)._keys and
-                self._dictionary == (<FiniteFamily_base> other)._dictionary)
+                self._keys == (<FiniteFamily> other)._keys and
+                self._dictionary == (<FiniteFamily> other)._dictionary)
 
     def _repr_(self):
         """
@@ -796,49 +834,6 @@ cdef class FiniteFamily_base(AbstractFamily):
         self.__init__(state['dictionary'], keys=state.get("keys"))
 
 
-class FiniteFamily(FiniteFamily_base):
-    r"""
-    A :class:`FiniteFamily` is an associative container which models a finite
-    family `(f_i)_{i \in I}`. Its elements `f_i` are therefore its
-    values. Instances should be created via the :func:`Family` factory. See its
-    documentation for examples and tests.
-
-    EXAMPLES:
-
-    We define the family `(f_i)_{i \in \{3,4,7\}}` with `f_3=a`,
-    `f_4=b`, and `f_7=d`::
-
-        sage: from sage.sets.family import FiniteFamily
-        sage: f = FiniteFamily({3: 'a', 4: 'b', 7: 'd'})
-
-    Individual elements are accessible as in a usual dictionary::
-
-        sage: f[7]
-        'd'
-
-    And the other usual dictionary operations are also available::
-
-        sage: len(f)
-        3
-        sage: f.keys()
-        [3, 4, 7]
-
-    However f behaves as a container for the `f_i`'s::
-
-        sage: list(f)
-        ['a', 'b', 'd']
-        sage: [ x for x in f ]
-        ['a', 'b', 'd']
-
-    The order of the elements can be specified using the ``keys`` optional argument::
-
-        sage: f = FiniteFamily({"a": "aa", "b": "bb", "c" : "cc" }, keys = ["c", "a", "b"])
-        sage: list(f)
-        ['cc', 'aa', 'bb']
-
-    """
-    pass
-
 class FiniteFamilyWithHiddenKeys(FiniteFamily):
     r"""
     A close variant of :class:`FiniteFamily` where the family contains some