Merge pull request #6283 from fchapoton/some_ruff_fixes

some autofixes by ruff about using max + one missing raise

Author: roed314

lmfdb/abvar/fq/isog_class.py

@@ -178,7 +178,7 @@ def newton_plot(self):
             L += line([(i, 0), (i, ymax)], color="grey", thickness=0.5)
         for j in range(ymax+1):
             L += line([(0, j), (xmax, j)], color="grey", thickness=0.5)
-        L+=line(pts,thickness=2)
+        L += line(pts, thickness=2)
         for v in pts:
             L += circle(v, 0.06, fill=True)
         L.axes(False)

lmfdb/belyi/main.py

@@ -713,7 +713,7 @@ def primitivization_search(info, query, search_type):
         re_str = PASSPORT_RE
         err_name = "passport"
     else:
-        ValueError("Invalid search type")
+        raise ValueError("invalid search type")
     if info.get("primitivization"):
         primitivization = info["primitivization"]
         if re.match(re_str, primitivization):

lmfdb/elliptic_curves/elliptic_curve.py

@@ -745,10 +745,8 @@ def modular_form_display(label, number):
         number = int(number)
     except ValueError:
         number = 10
-    if number < 10:
-        number = 10
-    if number > 1000:
-        number = 1000
+    number = max(number, 10)
+    number = min(number, 1000)
     ainvs = db.ec_curvedata.lookup(label, 'ainvs', 'lmfdb_label')
     if ainvs is None:
         return elliptic_curve_jump_error(label, {})

lmfdb/galois_groups/transitive_group.py

@@ -192,7 +192,7 @@ def characters(self):
 
     @lazy_attribute
     def conjclasses(self):
-        if self.num_conjclasses()>CC_LIMIT:
+        if self.num_conjclasses() > CC_LIMIT:
             return None
         g = self.gapgroupnt()
         n = self.n()
@@ -488,7 +488,7 @@ def group_cclasses_knowl_guts(n, t):
     rest += "<p><a title='Malle's constant $a(G)$' knowl='gg.malle_a'>'Malle's constant $a(G)$</a>: &nbsp; &nbsp;"
     wgg = WebGaloisGroup(label)
     if wgg.malle_a:
-        rest += '$%s$'%str(wgg.malle_a)
+        rest += '$%s$' % str(wgg.malle_a)
     else:
         rest += 'not computed'
     return rest

lmfdb/lattice/main.py

@@ -362,8 +362,7 @@ def theta_display(label, number):
         number = 20
     if number < 20:
         number = 30
-    if number > 150:
-        number = 150
+    number = min(number, 150)
     data = db.lat_lattices.lookup(label, projection=['theta_series'])
     coeff = [data['theta_series'][i] for i in range(number+1)]
     return print_q_expansion(coeff)

lmfdb/lfunctions/LfunctionPlot.py

@@ -234,10 +234,8 @@ def getWidthAndHeight(gls):
     for origin in db.lfunc_lfunctions.search({'group': gls[0], 'conductor': gls[1]}, 'origin'):
         splitId = origin.split('/')[6].split('_')
 
-        if float(splitId[0]) > xMax:
-            xMax = float(splitId[0])
-        if float(splitId[1]) > yMax:
-            yMax = float(splitId[1])
+        xMax = max(float(splitId[0]), xMax)
+        yMax = max(float(splitId[1]), yMax)
 
     xMax = math.ceil(xMax)
     yMax = math.ceil(yMax)
@@ -277,10 +275,8 @@ def paintSvgFileAll(glslist):  # list of group and level
             splitId = R.split('_')
             paralist.append((splitId[0], splitId[1], l['origin'], group, level,
                              char, R, ap_id, l['root_number']))
-            if float(splitId[0]) > xMax:
-                xMax = float(splitId[0])
-            if float(splitId[1]) > yMax:
-                yMax = float(splitId[1])
+            xMax = max(float(splitId[0]), xMax)
+            yMax = max(float(splitId[1]), yMax)
 
     xMax = int(math.ceil(xMax))
     yMax = int(math.ceil(yMax))
@@ -492,8 +488,7 @@ def colorsForWeights(num_weights):
                                     projection=['analytic_conductor', 'label', 'level', 'weight', 'conrey_index', 'dim', 'char_degree'],
                                     sort=[('analytic_conductor', 1)]):
         _, k, _, hecke_letter = nf['label'].split('.')
-        if int(k) > max_k:
-            max_k = int(k)
+        max_k = max(int(k), max_k)
         if nf['weight'] not in values:
             values[nf['weight']] = []
         if nf['dim'] == 1:
@@ -522,10 +517,8 @@ def colorsForWeights(num_weights):
             k = label[1]
             x = x_scale*float(Nk2)
             y = y_scale*z1
-            if y > y_max:
-                y_max = y
-            if x > x_max:
-                x_max = x
+            y_max = max(y, y_max)
+            x_max = max(x, x_max)
             points.append((x, y, lfun_url, ".".join(map(str, label)), k))
 
     # Begin drawing
@@ -796,20 +789,17 @@ def paintSvgHoloGeneral(Nmin, Nmax, kmin, kmax, imagewidth, imageheight):
             dimensioninfo['dotradius'] = radius
             dimensioninfo['connectinglinewidth'] = dimensioninfo['dotradius'] / 1.5
             dimensioninfo['firstdotoffset'] = [0.0, 0.0]
-#
             appearanceinfo = {}
             # appearanceinfo['edgewidth'] = dimensioninfo['dotspacing'][0]/1.0  #just a guess
             appearanceinfo['edgewidth'] = [0, 0]  # remove the sector edges
             appearanceinfo['edgestyle'] = 'stroke-dasharray:3,3'
             appearanceinfo['edgecolor'] = 'rgb(202,202,102)'
             appearanceinfo['fontsize'] = 'font-size:11px'
             appearanceinfo['fontweight'] = ""
-#
             urlinfo = {'base': '/L/ModularForm/GL2/Q/holomorphic?'}
             urlinfo['space'] = {'weight': y}
             urlinfo['space']['level'] = x
             urlinfo['space']['character'] = 0
-#
             # scale = 1 # not used
             # Symmetry types: +1 or -1
             symmetrytype = [1, -1]
@@ -879,7 +869,6 @@ def paintCSHoloTMP(width, height, xMax, yMax, xfactor, yfactor, ticlength):
     xmlText = xmlText + ("<line x1='0' y1='" + str(
         height) + "' x2='0' y2='0' style='stroke:rgb(0,0,0);'/>\n")  # draw vertical axis
     xmlText += "<text x='50.0' y='491.0' font-style='italic'>level</text>"
-#
     # xmlText += mytext("level", [0,height], [xfactor, yfactor], [0.2, 0.7],
     # "", 'font-size:11px', "", 'rgb(0,0,0)')
     xmlText += "<text x='33.0' y='411.0' transform='rotate(270 33, 411)' font-style='italic'>weight</text>"

lmfdb/local_fields/main.py

@@ -470,7 +470,7 @@ def render_field_webpage(args):
                     'subfields': format_subfields(data['subfield'],data['subfield_mult'],p),
                     'aut': data['aut'],
                     })
-        friends=[]
+        friends = []
         if 'slopes' in data:
             info.update({'slopes': show_slopes(data['slopes'])})
         if 'inertia' in data:

lmfdb/modlmf/main.py

@@ -225,10 +225,8 @@ def q_exp_display(label, number):
         number = int(number)
     except Exception:
         number = 20
-    if number < 20:
-        number = 20
-    if number > 150:
-        number = 150
+    number = max(number, 20)
+    number = min(number, 150)
     coeffs = db.modlmf_forms.lookup(label, projection='coeffs')[:number+1]
     return print_q_expansion(coeffs)
 

lmfdb/riemann/stieltjes/stieltjes.py

@@ -34,10 +34,8 @@ def list_constants(start=None,
 
     if limit < 0:
         limit = 100
-    if limit > 1000:
-        limit = 1000
-    if start < 0:
-        start = 0
+    limit = min(limit, 1000)
+    start = max(start, 0)
     s_constants = stieltjes_list(start, limit)
 
     if fmt == 'plain':

lmfdb/tensor_products/galois_reps.py

@@ -510,8 +510,7 @@ def set_number_of_coefficients(self):
         self.ld._gp_eval("MaxImaginaryPart = %s" % self.max_imaginary_part)
         self.numcoeff = self.ld.num_coeffs()
         # to be on the safe side, we make sure to have a min of terms
-        if self.numcoeff < 50:
-            self.numcoeff = 50
+        self.numcoeff = max(self.numcoeff, 50)
 
 ## produce coefficients