passagemath-modules 10.5.46__cp310-cp310-macosx_14_0_arm64.whl → 10.6.20__cp310-cp310-macosx_14_0_arm64.whl

sage/matroids/lean_matrix.pyx

@@ -167,7 +167,7 @@ cdef class LeanMatrix:
         cdef long i, j
         cdef LeanMatrix A = type(self)(self.nrows(), self.ncols() + self.nrows())
         for i in range(self.nrows()):
-            A.set_unsafe(i, i, self.base_ring()(1))
+            A.set_unsafe(i, i, self.base_ring().one())
             for j in range(self.ncols()):
                 A.set_unsafe(i, self.nrows() + j, self.get_unsafe(i, j))
         return A
@@ -209,9 +209,9 @@ cdef class LeanMatrix:
             sage: A.base_ring()
             Traceback (most recent call last):
             ...
-            NotImplementedError: subclasses need to implement this.
+            NotImplementedError: subclasses need to implement this
         """
-        raise NotImplementedError("subclasses need to implement this.")
+        raise NotImplementedError("subclasses need to implement this")
 
     cpdef characteristic(self):
         """
@@ -358,7 +358,7 @@ cdef class LeanMatrix:
         and compatible dimensions.
         """
         cdef LeanMatrix A = type(self)(self.nrows(), other.ncols())
-        cdef i, j, k
+        cdef long i, j, k
         for i in range(self.nrows()):
             for j in range(other.ncols()):
                 for k in range(self.ncols()):
@@ -488,9 +488,9 @@ cdef class LeanMatrix:
             sage: A == loads(dumps(A))  # indirect doctest
             Traceback (most recent call last):
             ...
-            NotImplementedError: subclasses need to implement this.
+            NotImplementedError: subclasses need to implement this
         """
-        raise NotImplementedError("subclasses need to implement this.")
+        raise NotImplementedError("subclasses need to implement this")
 
     cdef shifting_all(self, P_rows, P_cols, Q_rows, Q_cols, int m):
         r"""
@@ -697,8 +697,8 @@ cdef class GenericMatrix(LeanMatrix):
         # Default:
         if self._base_ring is None:
             self._base_ring = ZZ
-        self._zero = self._base_ring(0)
-        self._one = self._base_ring(1)
+        self._zero = self._base_ring.zero()
+        self._one = self._base_ring.one()
         self._entries = [self._zero] * nrows * ncols
         if M is not None:
             if isinstance(M, GenericMatrix):
@@ -996,8 +996,8 @@ cdef class BinaryMatrix(LeanMatrix):
         global GF2, GF2_zero, GF2_one, GF2_not_defined
         if GF2_not_defined:
             GF2 = GF(2)
-            GF2_zero = GF2(0)
-            GF2_one = GF2(1)
+            GF2_zero = GF2.zero()
+            GF2_one = GF2.one()
             GF2_not_defined = False
         if M is not None:
             if isinstance(M, BinaryMatrix):
@@ -1434,7 +1434,7 @@ cdef class BinaryMatrix(LeanMatrix):
         if s_eq.nrows() != o_eq.nrows():
             return False
         if s_eq.nrows() == s_eq.ncols():  # s_eq and o_eq partition into singletons
-            morph = [0 for i in range(self._nrows)]
+            morph = [0 for _ in range(self._nrows)]
             for i in range(self._nrows):
                 morph[bitset_first(s_eq._M[i])] = bitset_first(o_eq._M[i])
             for i in range(self._nrows):
@@ -1581,8 +1581,8 @@ cdef class TernaryMatrix(LeanMatrix):
         global GF3, GF3_zero, GF3_one, GF3_minus_one, GF3_not_defined
         if GF3_not_defined:
             GF3 = GF(3)
-            GF3_zero = GF3(0)
-            GF3_one = GF3(1)
+            GF3_zero = GF3.zero()
+            GF3_one = GF3.one()
             GF3_minus_one = GF3(2)
             GF3_not_defined = False
 
@@ -2171,8 +2171,8 @@ cdef class QuaternaryMatrix(LeanMatrix):
         if M is not None:
             if isinstance(M, QuaternaryMatrix):
                 self._gf4 = (<QuaternaryMatrix>M)._gf4
-                self._zero = self._gf4(0)
-                self._one = self._gf4(1)
+                self._zero = self._gf4.zero()
+                self._one = self._gf4.one()
                 self._x_zero = self._gf4.gens()[0]
                 self._x_one = self._x_zero + self._one
                 for i in range((<QuaternaryMatrix>M)._nrows):
@@ -2180,8 +2180,8 @@ cdef class QuaternaryMatrix(LeanMatrix):
                     bitset_copy(self._M1[i], (<QuaternaryMatrix>M)._M1[i])
             elif isinstance(M, LeanMatrix):
                 self._gf4 = (<LeanMatrix>M).base_ring()
-                self._zero = self._gf4(0)
-                self._one = self._gf4(1)
+                self._zero = self._gf4.zero()
+                self._one = self._gf4.one()
                 self._x_zero = self._gf4.gens()[0]
                 self._x_one = self._x_zero + self._one
                 for i in range(M.nrows()):
@@ -2189,19 +2189,19 @@ cdef class QuaternaryMatrix(LeanMatrix):
                         self.set(i, j, (<LeanMatrix>M).get_unsafe(i, j))
             elif isinstance(M, Matrix):
                 self._gf4 = (<Matrix>M).base_ring()
-                self._zero = self._gf4(0)
-                self._one = self._gf4(1)
+                self._zero = self._gf4.zero()
+                self._one = self._gf4.one()
                 self._x_zero = self._gf4.gens()[0]
                 self._x_one = self._x_zero + self._one
                 for i in range(M.nrows()):
                     for j in range(M.ncols()):
                         self.set(i, j, (<Matrix>M).get_unsafe(i, j))
             else:
-                raise TypeError("unrecognized input type.")
+                raise TypeError("unrecognized input type")
         else:
             self._gf4 = ring
-            self._zero = self._gf4(0)
-            self._one = self._gf4(1)
+            self._zero = self._gf4.zero()
+            self._one = self._gf4.one()
             self._x_zero = self._gf4.gens()[0]
             self._x_one = self._x_zero + self._one
 

sage/matroids/linear_matroid.pyx

@@ -879,8 +879,8 @@ cdef class LinearMatroid(BasisExchangeMatroid):
         try:
             if GF2_not_defined:
                 GF2 = GF(2)
-                GF2_zero = GF2(0)
-                GF2_one = GF2(1)
+                GF2_zero = GF2.zero()
+                GF2_one = GF2.one()
                 GF2_not_defined = False
         except ImportError:
             pass
@@ -1333,8 +1333,8 @@ cdef class LinearMatroid(BasisExchangeMatroid):
             sage: M = Matroid(groundset='abcdefgh', ring=GF(5),
             ....: reduced_matrix=[[2, 1, 1, 0],
             ....:                 [1, 1, 0, 1], [1, 0, 1, 1], [0, 1, 1, 2]])
-            sage: N = M._minor(contractions=set(['a']), deletions=set([]))
-            sage: N._minor(contractions=set([]), deletions=set(['b', 'c']))
+            sage: N = M._minor(contractions=set(['a']), deletions=set())
+            sage: N._minor(contractions=set(), deletions=set(['b', 'c']))
             Linear matroid of rank 3 on 5 elements represented over the Finite
             Field of size 5
         """
@@ -2848,7 +2848,7 @@ cdef class LinearMatroid(BasisExchangeMatroid):
             if sol:
                 if certificate:
                     (certX, certY) = cert_pair
-                    cert = set([])
+                    cert = set()
                     for x in certX:
                         cert.add(dX[x])
                     for y in certY:
@@ -3101,8 +3101,8 @@ cdef class BinaryMatroid(LinearMatroid):
         global GF2, GF2_zero, GF2_one, GF2_not_defined
         if GF2_not_defined:
             GF2 = GF(2)
-            GF2_zero = GF2(0)
-            GF2_one = GF2(1)
+            GF2_zero = GF2.zero()
+            GF2_one = GF2.one()
             GF2_not_defined = False
 
         # Setup representation; construct displayed basis
@@ -3785,8 +3785,8 @@ cdef class BinaryMatroid(LinearMatroid):
         EXAMPLES::
 
             sage: M = matroids.catalog.Fano()
-            sage: N = M._minor(contractions=set(['a']), deletions=set([]))
-            sage: N._minor(contractions=set([]), deletions=set(['b', 'c']))
+            sage: N = M._minor(contractions=set(['a']), deletions=set())
+            sage: N._minor(contractions=set(), deletions=set(['b', 'c']))
             Binary matroid of rank 2 on 4 elements, type (0, 6)
         """
         self._move_current_basis(contractions, deletions)
@@ -4820,8 +4820,8 @@ cdef class TernaryMatroid(LinearMatroid):
         EXAMPLES::
 
             sage: M = matroids.catalog.P8()
-            sage: N = M._minor(contractions=set(['a']), deletions=set([]))
-            sage: N._minor(contractions=set([]), deletions=set(['b', 'c']))
+            sage: N = M._minor(contractions=set(['a']), deletions=set())
+            sage: N._minor(contractions=set(), deletions=set(['b', 'c']))
             Ternary matroid of rank 3 on 5 elements, type 0-
         """
         self._move_current_basis(contractions, deletions)
@@ -5588,8 +5588,8 @@ cdef class QuaternaryMatroid(LinearMatroid):
         EXAMPLES::
 
             sage: M = matroids.catalog.Q10()                                            # needs sage.rings.finite_rings
-            sage: N = M._minor(contractions=set(['a']), deletions=set([]))              # needs sage.rings.finite_rings
-            sage: N._minor(contractions=set([]), deletions=set(['b', 'c']))             # needs sage.rings.finite_rings
+            sage: N = M._minor(contractions=set(['a']), deletions=set())              # needs sage.rings.finite_rings
+            sage: N._minor(contractions=set(), deletions=set(['b', 'c']))             # needs sage.rings.finite_rings
             Quaternary matroid of rank 4 on 7 elements
         """
         self._move_current_basis(contractions, deletions)

sage/matroids/matroid.pyx

@@ -906,7 +906,7 @@ cdef class Matroid(SageObject):
             True
         """
         cdef set XX = set(X)
-        cdef set res = set([])
+        cdef set res = set()
         cdef int r = self._rank(frozenset(X))
         for e in Y:
             XX.add(e)
@@ -1167,8 +1167,8 @@ cdef class Matroid(SageObject):
         EXAMPLES::
 
             sage: M = matroids.catalog.Vamos()
-            sage: N = M._minor(contractions=set(['a']), deletions=set([]))
-            sage: N._minor(contractions=set([]), deletions=set(['b', 'c']))
+            sage: N = M._minor(contractions=set(['a']), deletions=set())
+            sage: N._minor(contractions=set(), deletions=set(['b', 'c']))
             M / {'a'} \ {'b', 'c'}, where M is Vamos:
             Matroid of rank 4 on 8 elements with circuit-closures
             {3: {{'a', 'b', 'c', 'd'}, {'a', 'b', 'e', 'f'},
@@ -2615,7 +2615,7 @@ cdef class Matroid(SageObject):
             sage: [sorted(X) for X in CC[3]]
             [['a', 'b', 'c', 'd', 'e', 'f', 'g']]
         """
-        CC = [set([]) for r in range(self.rank() + 1)]
+        CC = [set() for r in range(self.rank() + 1)]
         for C in self.circuits_iterator():
             CC[len(C) - 1].add(self.closure(C))
         return {r: CC[r] for r in range(self.rank() + 1) if CC[r]}
@@ -2646,7 +2646,7 @@ cdef class Matroid(SageObject):
             ...
             KeyError: 3
         """
-        CC = [set([]) for r in range(self.rank() + 1)]
+        CC = [set() for r in range(self.rank() + 1)]
         for C in self.nonspanning_circuits_iterator():
             CC[len(C) - 1].add(self.closure(C))
         return {r: CC[r] for r in range(self.rank() + 1) if CC[r]}
@@ -4960,7 +4960,7 @@ cdef class Matroid(SageObject):
         """
         E = set(self.groundset())
         E.difference_update(self._closure(frozenset()))  # groundset minus loops
-        res = set([])
+        res = set()
 
         while E:
             e = E.pop()
@@ -4996,7 +4996,7 @@ cdef class Matroid(SageObject):
         """
         E = set(self.groundset())
         E.difference_update(self._coclosure(frozenset()))  # groundset minus coloops
-        res = set([])
+        res = set()
 
         while E:
             e = E.pop()
@@ -5428,7 +5428,7 @@ cdef class Matroid(SageObject):
                     for R1 in map(set, combinations(R, r2)):
                         R2 = R - R1
                         # F is the set of elements cannot be in the extension of Q1
-                        F = set([])
+                        F = set()
                         U = E - R
                         # if Q1|R1 is full
                         if m-len(Q1)-len(R1) == 0:
@@ -5941,14 +5941,14 @@ cdef class Matroid(SageObject):
             ....:                                  [0,0,0,0,1,1,1,1,0,0,1,1],
             ....:                                  [0,0,0,0,0,0,0,0,1,1,1,1]])
             sage: M._shifting_all(M.basis(),
-            ....:                 set([0,1]), set([0,1]), set([]), set([]), 3)
+            ....:                 set([0,1]), set([0,1]), set(), set(), 3)
             (False, None)
             sage: M = Matroid(field=GF(2), reduced_matrix=[[1,0,1,1,1],
             ....:                                          [1,1,1,1,0],
             ....:                                          [0,1,1,1,0],
             ....:                                          [0,0,0,1,1]])
             sage: M._shifting_all(M.basis(),
-            ....:                 set([0,1]), set([5,8]), set([]), set([]), 3)[0]
+            ....:                 set([0,1]), set([5,8]), set(), set(), 3)[0]
             True
         """
         Y = self.groundset()-X
@@ -6002,14 +6002,14 @@ cdef class Matroid(SageObject):
             ....:                                  [0,0,0,0,1,1,1,1,0,0,1,1],
             ....:                                  [0,0,0,0,0,0,0,0,1,1,1,1]])
             sage: M._shifting(M.basis(),
-            ....:             set([0,1]), set([0,1]), set([]), set([]), 3)
+            ....:             set([0,1]), set([0,1]), set(), set(), 3)
             (False, None)
             sage: M = Matroid(field=GF(2), reduced_matrix=[[1,0,1,1,1],
             ....:                                          [1,1,1,1,0],
             ....:                                          [0,1,1,1,0],
             ....:                                          [0,0,0,1,1]])
             sage: M._shifting(M.basis(),
-            ....:             set([0,1]), set([5,8]), set([]), set([4]), 3)[0]
+            ....:             set([0,1]), set([5,8]), set(), set([4]), 3)[0]
             True
         """
 
@@ -7039,7 +7039,7 @@ cdef class Matroid(SageObject):
                 raise ValueError("nonnegative weights were expected.")
             wt = sorted(wt, reverse=True)
             Y = [e for (w, e) in wt]
-        res = set([])
+        res = set()
         r = 0
         for e in Y:
             res.add(e)
@@ -8018,8 +8018,8 @@ cdef class Matroid(SageObject):
         a = x
         b = y
         R = ZZ['x, y']
-        x, y = R._first_ngens(2)
-        T = R(0)
+        x, y = R.gens()
+        T = R.zero()
         for B in self.bases_iterator():
             T += x ** len(self._internal(B)) * y ** len(self._external(B))
         if a is not None and b is not None:

sage/matroids/matroids_plot_helpers.py

@@ -72,17 +72,16 @@ EXAMPLES::
 #                  https://www.gnu.org/licenses/
 # *****************************************************************************
 
-import scipy
-import scipy.interpolate
-import numpy as np
+from sage.matroids.advanced import newlabel
 from sage.misc.lazy_import import lazy_import
-lazy_import("sage.plot.all", ["Graphics", "line", "text", "polygon2d", "point", "points"])
-lazy_import("sage.plot.colors", "Color")
 from sage.sets.set import Set
-from sage.matroids.advanced import newlabel
 
+lazy_import("sage.plot.all", ["Graphics", "line", "text",
+                              "polygon2d", "point", "points"])
+lazy_import("sage.plot.colors", "Color")
 
-def it(M, B1, nB1, lps):
+
+def it(M, B1, nB1, lps) -> tuple[dict, list, list, list]:
     r"""
     Return points on and off the triangle and lines to be drawn for a rank 3
     matroid.
@@ -179,7 +178,7 @@ def it(M, B1, nB1, lps):
     return pts, trilines, nontripts, curvedlines
 
 
-def trigrid(tripts):
+def trigrid(tripts) -> list[list]:
     """
     Return a grid of 4 points inside given 3 points as a list.
 
@@ -206,7 +205,7 @@ def trigrid(tripts):
 
     .. NOTE::
 
-            This method does NOT do any checks.
+        This method does NOT do any checks.
     """
     pairs = [[0, 1], [1, 2], [0, 2]]
     cpt = [float(tripts[0][0] + tripts[1][0] + tripts[2][0]) / 3,
@@ -219,7 +218,7 @@ def trigrid(tripts):
     return grid
 
 
-def addnontripts(tripts_labels, nontripts_labels, ptsdict):
+def addnontripts(tripts_labels, nontripts_labels, ptsdict) -> dict:
     """
     Return modified ``ptsdict`` with additional keys and values corresponding
     to ``nontripts``.
@@ -261,16 +260,16 @@ def addnontripts(tripts_labels, nontripts_labels, ptsdict):
 
     .. NOTE::
 
-            This method does NOT do any checks.
+        This method does NOT do any checks.
     """
     tripts = [list(ptsdict[p]) for p in tripts_labels]
     pairs = [[0, 1], [1, 2], [0, 2]]
     q = [tripts]
     num = len(nontripts_labels)
-    gridpts = [[float((tripts[0][0]+tripts[1][0]+tripts[2][0])/3),
-               float(tripts[0][1]+tripts[1][1]+tripts[2][1])/3]]
+    gridpts = [[float((tripts[0][0] + tripts[1][0] + tripts[2][0]) / 3),
+               float(tripts[0][1] + tripts[1][1] + tripts[2][1]) / 3]]
     n = 0
-    while n < num+1:
+    while n < num + 1:
         g = trigrid(q[0])
         q.extend([[g[0], q[0][pairs[0][0]], q[0][pairs[0][1]]],
                   [g[0], q[0][pairs[1][0]], q[0][pairs[1][1]]],
@@ -286,7 +285,7 @@ def addnontripts(tripts_labels, nontripts_labels, ptsdict):
     return ptsdict
 
 
-def createline(ptsdict, ll, lineorders2=None):
+def createline(ptsdict, ll, lineorders2=None) -> tuple[list, list, list, list]:
     """
     Return ordered lists of coordinates of points to be traversed to draw a
     2D line.
@@ -335,8 +334,12 @@ def createline(ptsdict, ll, lineorders2=None):
 
     .. NOTE::
 
-            This method does NOT do any checks.
+        This method does NOT do any checks.
     """
+    import scipy
+    import scipy.interpolate
+    import numpy as np
+
     x, lo = line_hasorder(ll, lineorders2)
     flip = False
     if not x:
@@ -368,7 +371,7 @@ def createline(ptsdict, ll, lineorders2=None):
     return sortedx, sortedy, x_i, y_i
 
 
-def slp(M1, pos_dict=None, B=None):
+def slp(M1, pos_dict=None, B=None) -> tuple:
     """
     Return simple matroid, loops and parallel elements of given matroid.
 
@@ -396,7 +399,7 @@ def slp(M1, pos_dict=None, B=None):
         sage: M1 = Matroid(ring=GF(2), matrix=[[1, 0, 0, 0, 1, 1, 1,0,1,0,1],
         ....:                                  [0, 1, 0, 1, 0, 1, 1,0,0,1,0],
         ....:                                  [0, 0, 1, 1, 1, 0, 1,0,0,0,0]])
-        sage: [M,L,P] = matroids_plot_helpers.slp(M1)                                   # needs sage.rings.finite_rings
+        sage: M, L, P = matroids_plot_helpers.slp(M1)                                   # needs sage.rings.finite_rings
         sage: M.is_simple()                                                             # needs sage.rings.finite_rings
         True
         sage: setprint([L,P])                                                           # needs sage.rings.finite_rings
@@ -406,7 +409,7 @@ def slp(M1, pos_dict=None, B=None):
         ....:                                  [0, 0, 1, 1, 1, 0, 1,0,0,0,0]])
         sage: posdict = {8: (0, 0),  1: (2, 0),  2: (1, 2),  3: (1.5, 1.0),
         ....:            4: (0.5, 1.0),  5: (1.0, 0.0), 6: (1.0, 0.6666666666666666)}
-        sage: [M,L,P] = matroids_plot_helpers.slp(M1, pos_dict=posdict)                 # needs sage.rings.finite_rings
+        sage: M, L, P = matroids_plot_helpers.slp(M1, pos_dict=posdict)                 # needs sage.rings.finite_rings
         sage: M.is_simple()                                                             # needs sage.rings.finite_rings
         True
         sage: setprint([L,P])                                                           # needs sage.rings.finite_rings
@@ -414,23 +417,23 @@ def slp(M1, pos_dict=None, B=None):
 
     .. NOTE::
 
-            This method does NOT do any checks.
+        This method does NOT do any checks.
     """
     L = set(M1.loops())
     nP = L | set(M1.simplify().groundset())
-    P = set(M1.groundset())-nP
+    P = set(M1.groundset()) - nP
     if P:
         if pos_dict is not None:
-            pcls = list(set([frozenset(set(M1.closure([p])) - L)
-                             for p in list(P)]))
+            pcls = list({frozenset(set(M1.closure([p])) - L)
+                         for p in list(P)})
             newP = []
             for pcl in pcls:
                 pcl_in_dict = [p for p in list(pcl) if p in pos_dict.keys()]
-                newP.extend(list(pcl-set([pcl_in_dict[0]])))
+                newP.extend(list(pcl - set([pcl_in_dict[0]])))
             return [M1.delete(L | set(newP)), L, set(newP)]
         elif B is not None:
-            pcls = list(set([frozenset(set(M1.closure([p])) - L)
-                             for p in list(P)]))
+            pcls = list({frozenset(set(M1.closure([p])) - L)
+                         for p in list(P)})
             newP = []
             for pcl in pcls:
                 pcl_list = list(pcl)
@@ -446,7 +449,7 @@ def slp(M1, pos_dict=None, B=None):
         return [M1.delete(L | P), L, P]
 
 
-def addlp(M, M1, L, P, ptsdict, G=None, limits=None):
+def addlp(M, M1, L, P, ptsdict, G=None, limits=None) -> tuple:
     """
     Return a graphics object containing loops (in inset) and parallel elements
     of matroid.
@@ -477,13 +480,13 @@ def addlp(M, M1, L, P, ptsdict, G=None, limits=None):
         sage: M = Matroid(ring=GF(2), matrix=[[1, 0, 0, 0, 1, 1, 1,0,1],
         ....:                                 [0, 1, 0, 1, 0, 1, 1,0,0],
         ....:                                 [0, 0, 1, 1, 1, 0, 1,0,0]])
-        sage: [M1,L,P] = matroids_plot_helpers.slp(M)                                   # needs sage.rings.finite_rings
+        sage: M1, L, P = matroids_plot_helpers.slp(M)                                   # needs sage.rings.finite_rings
         sage: G, lims = matroids_plot_helpers.addlp(M,M1,L,P,{0:(0,0)})                 # needs sage.plot sage.rings.finite_rings
         sage: G.show(axes=False)                                                        # needs sage.plot sage.rings.finite_rings
 
     .. NOTE::
 
-            This method does NOT do any checks.
+        This method does NOT do any checks.
     """
     if G is None:
         G = Graphics()
@@ -552,7 +555,7 @@ def addlp(M, M1, L, P, ptsdict, G=None, limits=None):
     return G, limits
 
 
-def line_hasorder(l, lodrs=None):
+def line_hasorder(l, lodrs=None) -> tuple[bool, list]:
     """
     Determine if an order is specified for a line.
 
@@ -582,7 +585,7 @@ def line_hasorder(l, lodrs=None):
 
     .. NOTE::
 
-            This method does NOT do any checks.
+        This method does NOT do any checks.
     """
     if lodrs is not None:
         set_l = Set(l)
@@ -593,7 +596,7 @@ def line_hasorder(l, lodrs=None):
     return False, []
 
 
-def lineorders_union(lineorders1, lineorders2):
+def lineorders_union(lineorders1, lineorders2) -> list:
     """
     Return a list of ordered lists of ground set elements that corresponds to
     union of two sets of ordered lists of ground set elements in a sense.
@@ -634,7 +637,7 @@ def lineorders_union(lineorders1, lineorders2):
         return None
 
 
-def posdict_is_sane(M1, pos_dict):
+def posdict_is_sane(M1, pos_dict) -> bool:
     """
     Return a boolean establishing sanity of ``posdict`` wrt matroid ``M``.
 
@@ -666,25 +669,24 @@ def posdict_is_sane(M1, pos_dict):
 
     .. NOTE::
 
-            This method does NOT do any checks. ``M1`` is assumed to be a
-            matroid and ``posdict`` is assumed to be a dictionary.
+        This method does NOT do any checks. ``M1`` is assumed to be a
+        matroid and ``posdict`` is assumed to be a dictionary.
     """
     L = set(M1.loops())
     nP = L | set(M1.simplify().groundset())
-    P = set(M1.groundset())-nP
-    pcls = list(set([frozenset(set(M1.closure([p])) - L) for p in list(P)]))
+    P = set(M1.groundset()) - nP
+    pcls = list({frozenset(set(M1.closure([p])) - L) for p in list(P)})
     for pcl in pcls:
-        pcl_list = list(pcl)
-        if not any(x in pos_dict for x in pcl_list):
+        if not any(x in pos_dict for x in pcl):
             return False
     allP = []
     for pcl in pcls:
-        allP.extend(list(pcl))
+        allP.extend(pcl)
     return all(x in pos_dict
                for x in list(set(M1.groundset()) - (L | set(allP))))
 
 
-def tracklims(lims, x_i=[], y_i=[]):
+def tracklims(lims, x_i=[], y_i=[]) -> list:
     """
     Return modified limits list.
 
@@ -705,12 +707,12 @@ def tracklims(lims, x_i=[], y_i=[]):
 
     .. NOTE::
 
-            This method does NOT do any checks.
+        This method does NOT do any checks.
     """
     if lims is not None and lims[0] is not None and lims[1] is not None and \
        lims[2] is not None and lims[3] is not None:
-        lims = [min(min(x_i), lims[0]), max(max(x_i), lims[1]),
-                min(min(y_i), lims[2]), max(max(y_i), lims[3])]
+        lims = [min(*x_i, lims[0]), max(*x_i, lims[1]),
+                min(*y_i, lims[2]), max(*y_i, lims[3])]
     else:
         lims = [min(x_i), max(x_i), min(y_i), max(y_i)]
     return lims
@@ -753,11 +755,11 @@ def geomrep(M1, B1=None, lineorders1=None, pd=None, sp=False):
 
     .. NOTE::
 
-            This method does NOT do any checks.
+        This method does NOT do any checks.
     """
     G = Graphics()
     # create lists of loops and parallel elements and simplify given matroid
-    [M, L, P] = slp(M1, pos_dict=pd, B=B1)
+    M, L, P = slp(M1, pos_dict=pd, B=B1)
     if B1 is None:
         B1 = list(M.basis())
     M._cached_info = M1._cached_info

sage/matroids/minor_matroid.py

@@ -325,8 +325,8 @@ class MinorMatroid(Matroid):
 
             sage: from sage.matroids.advanced import *
             sage: M = MinorMatroid(matroids.catalog.Vamos(), contractions=set('c'), deletions={'b', 'f'})
-            sage: N = M._minor(contractions=set(['a']), deletions=set([]))
-            sage: N._minor(contractions=set([]), deletions=set(['d']))
+            sage: N = M._minor(contractions=set(['a']), deletions=set())
+            sage: N._minor(contractions=set(), deletions=set(['d']))
             M / {'a', 'c'} \ {'b', 'd', 'f'}, where M is Vamos:
             Matroid of rank 4 on 8 elements with circuit-closures
             {3: {{'a', 'b', 'c', 'd'}, {'a', 'b', 'e', 'f'},

sage/matroids/transversal_matroid.pyx

@@ -43,19 +43,19 @@ REFERENCES:
 #  Distributed under the terms of the GNU General Public License (GPL)
 #  as published by the Free Software Foundation; either version 2 of
 #  the License, or (at your option) any later version.
-#                  http://www.gnu.org/licenses/
+#                  https://www.gnu.org/licenses/
 # *****************************************************************************
 
 from collections import Counter
 from copy import copy
 from cpython.object cimport Py_EQ, Py_NE
-from sage.graphs.graph import Graph
+import networkx as nx
+
 from sage.graphs.digraph import DiGraph
 from sage.graphs.bipartite_graph import BipartiteGraph
 from sage.matroids.basis_exchange_matroid cimport BasisExchangeMatroid
 from sage.matroids.minor_matroid import MinorMatroid
 from sage.matroids.utilities import newlabel
-import networkx as nx
 
 
 cdef class TransversalMatroid(BasisExchangeMatroid):

sage/matroids/union_matroid.pyx

@@ -1,4 +1,7 @@
 # sage_setup: distribution = sagemath-modules
+r"""
+Union of matroids
+"""
 from sage.matroids.matroid cimport Matroid
 
 cdef class MatroidUnion(Matroid):