ruff auto-fix for C4 in modular

fchapoton · fchapoton · commit 69d7cdaa2fc1 · 2023-11-06T10:02:16.000+01:00
diff --git a/src/sage/modular/abvar/abvar.py b/src/sage/modular/abvar/abvar.py
@@ -2060,8 +2060,8 @@ def newform_level(self, none_if_not_known=False):
             if none_if_not_known:
                 return None
             level = LCM([f.level() for f in self.newform_decomposition('a')])
-            groups = sorted(set([f.group() for f in
-                                 self.newform_decomposition('a')]))
+            groups = sorted({f.group() for f in
+                                 self.newform_decomposition('a')})
             if len(groups) == 1:
                 groups = groups[0]
             self.__newform_level = level, groups
@@ -3870,7 +3870,7 @@ def _factors_with_same_label(self, other):
         if not isinstance(other, ModularAbelianVariety_abstract):
             raise TypeError("other must be an abelian variety")
         D = self.decomposition()
-        C = set([A.newform_label() for A in other.decomposition()])
+        C = {A.newform_label() for A in other.decomposition()}
         Z = []
         for X in D:
             lbl = X.newform_label()
@@ -4899,7 +4899,7 @@ def tamagawa_number_bounds(self, p):
                 else:
                     raise NotImplementedError("Atkin-Lehner at p must act as a scalar")
         else:
-            mul_primes = sorted(set([p] + [q for q in prime_range(2, 2 * self.dimension() + 2)]))
+            mul_primes = sorted(set([p] + list(prime_range(2, 2 * self.dimension() + 2))))
         div = Integer(div)
         mul = Integer(mul)
         mul_primes = tuple(mul_primes)
diff --git a/src/sage/modular/abvar/homspace.py b/src/sage/modular/abvar/homspace.py
@@ -570,7 +570,7 @@ def calculate_generators(self):
             return
 
         if (self.domain() == self.codomain()) and (self.domain().dimension() == 1):
-            self._gens = tuple([ identity_matrix(ZZ,2) ])
+            self._gens = ( identity_matrix(ZZ,2), )
             return
 
         phi = self.domain()._isogeny_to_product_of_powers()
diff --git a/src/sage/modular/arithgroup/arithgroup_perm.py b/src/sage/modular/arithgroup/arithgroup_perm.py
@@ -1798,7 +1798,7 @@ def cusp_widths(self,exp=False):
         """
         inv = self.S2()**2
         L = self.L()
-        cusps = set(c[0] for c in L.cycle_tuples(singletons=True))
+        cusps = {c[0] for c in L.cycle_tuples(singletons=True)}
         if exp:
             widths = {}
         else:
@@ -2603,7 +2603,7 @@ def odd_subgroups(self):
         s3 = PermutationConstructor([x + tuple(y + n for y in x) for x in s3cycs])
         H = ArithmeticSubgroup_Permutation(S2=s2,S3=s3)
 
-        bucket = set([H])
+        bucket = {H}
         res = [H]
         # We use a set *and* a list since checking whether an element is in a
         # set is very fast, but on the other hand we want the order the results
diff --git a/src/sage/modular/arithgroup/congroup_gammaH.py b/src/sage/modular/arithgroup/congroup_gammaH.py
@@ -146,7 +146,7 @@ def _normalize_H(H, level):
     for h in H:
         if gcd(h, level) > 1:
             raise ArithmeticError('The generators %s must be units modulo %s' % (H, level))
-    H = set(u for u in H if u > 1)
+    H = {u for u in H if u > 1}
     final_H = set()
     for h in H:
         inv_h = h.inverse_mod(level)
@@ -1140,7 +1140,7 @@ def ncusps(self):
         c = ZZ(0)
         for d in (d for d in N.divisors() if d**2 <= N):
             Nd = lcm(d, N // d)
-            Hd = set([x % Nd for x in H])
+            Hd = {x % Nd for x in H}
             lenHd = len(Hd)
             if Nd - 1 not in Hd:
                 lenHd *= 2
@@ -1182,7 +1182,7 @@ def nregcusps(self):
         c = ZZ(0)
         for d in (d for d in divisors(N) if d**2 <= N):
             Nd = lcm(d, N // d)
-            Hd = set([x % Nd for x in H])
+            Hd = {x % Nd for x in H}
             if Nd - 1 not in Hd:
                 summand = euler_phi(d) * euler_phi(N // d) // (2 * len(Hd))
                 if d**2 == N:
@@ -1395,7 +1395,7 @@ def _list_subgroup(N, gens):
         sage: sage.modular.arithgroup.congroup_gammaH._list_subgroup(11, [3])
         [1, 3, 4, 5, 9]
     """
-    H = set([1])
+    H = {1}
     N = int(N)
     for g in gens:
         if gcd(g, N) != 1:
@@ -1405,7 +1405,7 @@ def _list_subgroup(N, gens):
         while not (gk in H):
             gk = (gk * g) % N
             sbgrp.append(gk)
-        H = set([(x * h) % N for x in sbgrp for h in H])
+        H = {(x * h) % N for x in sbgrp for h in H}
     return sorted(H)
 
 
diff --git a/src/sage/modular/btquotients/btquotient.py b/src/sage/modular/btquotients/btquotient.py
@@ -3710,7 +3710,7 @@ def _compute_quotient(self, check=True):
                                    'from expected.')
 
         self._nontorsion_generators = nontorsion_generators
-        self._boundary = dict([(vv.rep, vv) for vv in vertex_list])
+        self._boundary = {vv.rep: vv for vv in vertex_list}
         self._edge_list = edge_list
         self._vertex_list = vertex_list
         self._num_edges = num_edges
diff --git a/src/sage/modular/dirichlet.py b/src/sage/modular/dirichlet.py
@@ -1282,7 +1282,7 @@ def galois_orbit(self, sort=True):
         P = self.parent()
         z = self.element()
         o = int(z.additive_order())
-        Auts = set([m % o for m in P._automorphisms()])
+        Auts = {m % o for m in P._automorphisms()}
         v = [P.element_class(P, m * z, check=False) for m in Auts]
         if sort:
             v.sort()
diff --git a/src/sage/modular/etaproducts.py b/src/sage/modular/etaproducts.py
@@ -558,7 +558,7 @@ def basis(self, reduce=True):
             nf = (i < S.ncols() and S[i, i]) or 0  # ?
             good_vects.append((vect * 24 / gcd(nf, 24)).list())
         for v in good_vects:
-            v.append(-sum([r for r in v]))
+            v.append(-sum(list(v)))
         dicts = []
         for v in good_vects:
             dicts.append({})
diff --git a/src/sage/modular/hypergeometric_motive.py b/src/sage/modular/hypergeometric_motive.py
@@ -661,7 +661,7 @@ def wild_primes(self):
             [2, 3, 5]
         """
         gamma = self.gamma_array()
-        return sorted(set([p for n in gamma.keys() for (p, _) in n.factor()]))
+        return sorted({p for n in gamma.keys() for (p, _) in n.factor()})
 
     def zigzag(self, x, flip_beta=False):
         r"""
diff --git a/src/sage/modular/local_comp/smoothchar.py b/src/sage/modular/local_comp/smoothchar.py
@@ -1103,7 +1103,7 @@ def quadratic_chars(self):
             q = 1
         ram = [self.from_dirichlet(chi) for chi in DirichletGroup(self.prime() ** q, QQ) if not chi.is_trivial()]
         nr = self.character(0, [-1])
-        return sorted([nr] + [f for f in ram] + [f*nr for f in ram])
+        return sorted([nr] + list(ram) + [f*nr for f in ram])
 
 class SmoothCharacterGroupQuadratic(SmoothCharacterGroupGeneric):
     r"""
@@ -1793,12 +1793,12 @@ def exponents(self, c):
         c = ZZ(c)
         p = self.prime()
         if c == 0:
-            return tuple([0])
+            return (0,)
         elif c == 1:
-            return tuple([p - 1, 0])
+            return (p - 1, 0)
         elif p > 3 or self._unif_sqr == 3 or c <= 3:
             d = (c + 1) // 2
-            return tuple([p**(d - 1) * (p - 1), p**(c // 2), 0])
+            return (p**(d - 1) * (p - 1), p**(c // 2), 0)
         else:
             # awkward case, see above
             return self.ideal(c).idealstar(2).gens_orders() + (0,)
diff --git a/src/sage/modular/modform_hecketriangle/abstract_space.py b/src/sage/modular/modform_hecketriangle/abstract_space.py
@@ -761,7 +761,7 @@ def aut_factor(self, gamma, t):
         elif (gamma.is_reflection()):
             return self._ep * (t/QQbar(I))**self._weight
         else:
-            L = [v for v in gamma.word_S_T()[0]]
+            L = list(gamma.word_S_T()[0])
             aut_f = ZZ(1)
             while (len(L) > 0):
                 M = L.pop(-1)
@@ -1857,7 +1857,7 @@ def _quasi_form_matrix(self, min_exp=0, order_1=ZZ(0), incr_prec_by=0):
                 return A
 
             B = A
-            A = A.delete_rows([r for r in range(column_size + (row_size-column_size)//2 - 1, row_size)])
+            A = A.delete_rows(list(range(column_size + (row_size-column_size)//2 - 1, row_size)))
 
         # Next we simply delete row by row. Note that A is still modified here...
         while (B.rank() == column_size):
diff --git a/src/sage/modular/modform_hecketriangle/analytic_type.py b/src/sage/modular/modform_hecketriangle/analytic_type.py
@@ -445,7 +445,7 @@ def __init__(self):
                                  linear_extension=True, facade=False)
 
         L = self._base_poset.order_ideals_lattice()
-        H = L._hasse_diagram.relabel({i: x for i, x in enumerate(L._elements)},
+        H = L._hasse_diagram.relabel(dict(enumerate(L._elements)),
                                      inplace=False)
         FiniteLatticePoset.__init__(self, hasse_diagram=H,
                                     elements=L._elements, category=L.category(),
@@ -485,7 +485,7 @@ def __call__(self, *args, **kwargs):
             True
         """
         if len(args) > 1:
-            return super().__call__([arg for arg in args], **kwargs)
+            return super().__call__(list(args), **kwargs)
         else:
             return super().__call__(*args, **kwargs)
 
diff --git a/src/sage/modular/modform_hecketriangle/constructor.py b/src/sage/modular/modform_hecketriangle/constructor.py
@@ -129,8 +129,8 @@ def rational_type(f, n=ZZ(3), base_ring=ZZ):
 
     num = R(f.numerator())
     denom = R(f.denominator())
-    ep_num = set([ZZ.one() - 2*((sum([g.exponents()[0][m] for m in [1, 2]])) % 2) for g in dhom(num).monomials()])
-    ep_denom = set([ZZ.one() - 2*((sum([g.exponents()[0][m] for m in [1, 2]])) % 2) for g in dhom(denom).monomials()])
+    ep_num = {ZZ.one() - 2*((sum([g.exponents()[0][m] for m in [1, 2]])) % 2) for g in dhom(num).monomials()}
+    ep_denom = {ZZ.one() - 2*((sum([g.exponents()[0][m] for m in [1, 2]])) % 2) for g in dhom(denom).monomials()}
 
     if (n == infinity):
         hom_num = R(   num.subs(x=x**4, y=y**2, z=z**2) )
diff --git a/src/sage/modular/modform_hecketriangle/element.py b/src/sage/modular/modform_hecketriangle/element.py
@@ -337,7 +337,7 @@ def lseries(self, num_prec=None, max_imaginary_part=0, max_asymp_coeffs=40):
 
         # num_coeffs = L.num_coeffs()
         num_coeffs = L.num_coeffs(1.2)
-        coeff_vector = [coeff for coeff in self.q_expansion_vector(min_exp=0, max_exp=num_coeffs + 1, fix_d=True)]
+        coeff_vector = list(self.q_expansion_vector(min_exp=0, max_exp=num_coeffs + 1, fix_d=True))
         pari_precode = "coeff = {};".format(coeff_vector)
 
         L.init_coeffs(v="coeff[k+1]", pari_precode=pari_precode,
diff --git a/src/sage/modular/modform_hecketriangle/hecke_triangle_groups.py b/src/sage/modular/modform_hecketriangle/hecke_triangle_groups.py
@@ -803,7 +803,7 @@ def root_extension_embedding(self, D, K=None):
             else:
                 K = AlgebraicField()
 
-        L = [emb for emb in F.embeddings(K)]
+        L = list(F.embeddings(K))
 
         # Three possibilities up to numerical artefacts:
         # (1) emb = e, purely imaginary
diff --git a/src/sage/modular/modform_hecketriangle/space.py b/src/sage/modular/modform_hecketriangle/space.py
@@ -327,7 +327,7 @@ def coordinate_vector(self, v):
                 ambient_space = self.graded_ring().reduce_type("holo", degree=(gens[0].weight(), gens[0].ep()))
                 subspace = ambient_space.subspace(gens)
                 vector_part_in_subspace = subspace(parts[r])
-                coord_part = [v for v in vector_part_in_subspace.coordinate_vector()]
+                coord_part = list(vector_part_in_subspace.coordinate_vector())
                 coord_vector += coord_part
 
         return self._module(vector(self.coeff_ring(), coord_vector))
@@ -499,7 +499,7 @@ def coordinate_vector(self, v):
                 ambient_space = self.graded_ring().reduce_type("cusp", degree=(gens[0].weight(), gens[0].ep()))
                 subspace = ambient_space.subspace(gens)
                 vector_part_in_subspace = subspace(parts[r])
-                coord_part = [v for v in vector_part_in_subspace.coordinate_vector()]
+                coord_part = list(vector_part_in_subspace.coordinate_vector())
                 coord_vector += coord_part
 
         return self._module(vector(self.coeff_ring(), coord_vector))
diff --git a/src/sage/modular/modform_hecketriangle/subspace.py b/src/sage/modular/modform_hecketriangle/subspace.py
@@ -208,7 +208,7 @@ def __init__(self, ambient_space, basis, check):
         Module.__init__(self, base=ambient_space.base_ring())
 
         self._ambient_space = ambient_space
-        self._basis = [v for v in basis]
+        self._basis = list(basis)
         # self(v) instead would somehow mess up the coercion model
         self._gens = [self._element_constructor_(v) for v in basis]
         self._module = ambient_space._module.submodule([ambient_space.coordinate_vector(v) for v in basis])
diff --git a/src/sage/modular/modsym/ambient.py b/src/sage/modular/modsym/ambient.py
@@ -2260,7 +2260,7 @@ def integral_structure(self, algorithm='default'):
         # The attribute _mod2term is set by self.compute_presentation().
         # It is a list of pairs (n, c), such that the ith element of the list
         # is equivalent to c times the n-th basis Manin symbol.
-        G = set([i for i, _ in self._mod2term])
+        G = {i for i, _ in self._mod2term}
 
         # Now G is a set of integer i such that these integers gives
         # indices of Manin symbols that together generate the integral
diff --git a/src/sage/modular/modsym/boundary.py b/src/sage/modular/modsym/boundary.py
@@ -567,7 +567,7 @@ def __call__(self, x):
             return sum([c * self._coerce_in_manin_symbol(v) for c, v in S])
 
         elif is_FreeModuleElement(x):
-            y = {i: xi for i, xi in enumerate(x)}
+            y = dict(enumerate(x))
             return BoundarySpaceElement(self, y)
 
         raise TypeError("Coercion of %s (of type %s) into %s not (yet) defined." % (x, type(x), self))
diff --git a/src/sage/modular/modsym/ghlist.py b/src/sage/modular/modsym/ghlist.py
@@ -48,7 +48,7 @@ def __init__(self, group):
         N = group.level()
         v = group._coset_reduction_data()[0]
         N = group.level()
-        coset_reps = set([a for a, b, _ in v if b == 1])
+        coset_reps = {a for a, b, _ in v if b == 1}
         w = [group._reduce_coset(x*u, x*v) for x in coset_reps for u,v in p1list.P1List(N).list()]
         w = sorted(set(w))
         self.__list = w
diff --git a/src/sage/modular/modsym/relation_matrix.py b/src/sage/modular/modsym/relation_matrix.py
@@ -320,7 +320,7 @@ def gens_to_basis_matrix(syms, relation_matrix, mod, field, sparse):
     basis_set = set(A.nonpivots())
     pivots = A.pivots()
 
-    basis_mod2 = set([j for j, c in mod if c != 0])
+    basis_mod2 = {j for j, c in mod if c != 0}
 
     basis_set = basis_set.intersection(basis_mod2)
     basis = sorted(basis_set)
@@ -333,7 +333,7 @@ def gens_to_basis_matrix(syms, relation_matrix, mod, field, sparse):
     M = MatrixSpace(field, len(syms), len(basis), sparse=sparse)
 
     B = M(0)
-    cols_index = dict([(basis[i], i) for i in range(len(basis))])
+    cols_index = {basis[i]: i for i in range(len(basis))}
 
     for i in basis_mod2:
         t, l = search(basis, i)
diff --git a/src/sage/modular/multiple_zeta.py b/src/sage/modular/multiple_zeta.py
@@ -277,7 +277,7 @@ def composition_to_iterated(w, reverse=False) -> tuple[int, ...]:
         sage: composition_to_iterated((1,2), True)
         (1, 0, 1)
     """
-    word = tuple()
+    word = ()
     loop_over = reversed(w) if reverse else w
     for letter in loop_over:
         word += (1,) + (0,) * (letter - 1)
@@ -1175,7 +1175,7 @@ def simplify_full(self, basis=None):
             """
             if basis is None:
                 basis = self.parent().basis_brown
-            support = set(sum(d) for d in self.support())
+            support = {sum(d) for d in self.support()}
             result = self.parent().zero()
             for d in sorted(support):
                 h = self.homogeneous_component(d)
@@ -1994,7 +1994,7 @@ def __bool__(self) -> bool:
             P = self.parent()
             deg = P.degree_on_basis
             phi = P.phi
-            for d in sorted(set(deg(w) for w in self.support())):
+            for d in sorted({deg(w) for w in self.support()}):
                 z = self.homogeneous_component(d)
                 if not phi(z).is_zero():
                     return True
diff --git a/src/sage/modular/multiple_zeta_F_algebra.py b/src/sage/modular/multiple_zeta_F_algebra.py
@@ -121,7 +121,7 @@ def basis_f_odd_iterator(n, start=3) -> Iterator[tuple]:
          (3, 11)]
     """
     if n == 0:
-        yield tuple()
+        yield ()
         return
     if n % 2 and n >= start:
         yield (n,)
