Rename British-spelled internal identifiers

Follow-on to the prose pass, kept separate so it can be dropped on its
own.  Every name here has all of its references inside a single file (or,
for favourite_list, one view and its template), so each rename is the
definition and its uses together:

  draw_spectrum.py        centre_ratio, y_centre -> center_ratio, y_center
  WebEllipticCurve.py     EC_R_plot's colour parameter -> color
  web_newform.py          factorisation loop variable -> factorization
  galois_reps.py          renormalise_coefficients -> renormalize_coefficients
  search_wrapper.py       query_cancelled_error -> query_canceled_error
  hecke_algebras          favourite_list -> favorite_list (view + template)
  test_st.py              test_favourites -> test_favorites

query_cancelled_error is worth a look: it handles psycopg's
QueryCanceledError, which spells it with one l, so the handler and the
exception now agree.

Not renamed: signtocolour, which lmfdb/utils/__init__.py exports in
__all__ and five modules import.  Renaming it is an API change rather
than a spelling fix, so it and the locals built on it (signcolour,
thiscolour, colourplus, colourminus, test_signtocolour) are left for a
separate decision.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Author: roed314

lmfdb/classical_modular_forms/web_newform.py

@@ -1028,9 +1028,9 @@ def display_hecke_char_polys(self, num_disp=5):
                  th_wrap('charpoly', '$F_p(T)$'),
                  '  </tr>', '</thead>', '<tbody>']
         loop_count = 0
-        for p, factorisation in hecke_polys_orbits.items():
-            factorisation.sort(key=lambda elt: (elt[0].degree(), elt[1]))
-            charpoly = raw_typeset_poly_factor(factorisation, decreasing=True)
+        for p, factorization in hecke_polys_orbits.items():
+            factorization.sort(key=lambda elt: (elt[0].degree(), elt[1]))
+            charpoly = raw_typeset_poly_factor(factorization, decreasing=True)
             if loop_count < num_disp:
                 polys.append('  <tr>')
             else:

lmfdb/ecnf/WebEllipticCurve.py

@@ -215,12 +215,12 @@ def EC_R_plot_zone(f,h):
         return plot_zone_union(EC_R_plot_zone_piece(f,h,ZF[0],ZF[1]),EC_R_plot_zone_piece(f,h,ZF[2],2*xi-ZF[2]))
     return EC_R_plot_zone_piece(f,h,ZF[0],2*ZF[1]-ZF[0])
 
-def EC_R_plot(ainvs, xmin, xmax, ymin, ymax, colour, legend):
+def EC_R_plot(ainvs, xmin, xmax, ymin, ymax, color, legend):
     x = var('x')
     y = var('y')
     c = (xmin + xmax) / 2
     d = (xmax - xmin)
-    return implicit_plot(y ** 2 + ainvs[0] * x * y + ainvs[2] * y - x ** 3 - ainvs[1] * x ** 2 - ainvs[3] * x - ainvs[4], (x, xmin, xmax), (y, ymin, ymax), plot_points=500, aspect_ratio="automatic", color=colour) + plot(0, xmin=c - 1e-5 * d, xmax=c + 1e-5 * d, ymin=ymin, ymax=ymax, aspect_ratio="automatic", color=colour, legend_label=legend)  # Add an extra plot outside the visible frame because implicit plots are buggy: their legend does not show (https://trac.sagemath.org/ticket/15903)
+    return implicit_plot(y ** 2 + ainvs[0] * x * y + ainvs[2] * y - x ** 3 - ainvs[1] * x ** 2 - ainvs[3] * x - ainvs[4], (x, xmin, xmax), (y, ymin, ymax), plot_points=500, aspect_ratio="automatic", color=color) + plot(0, xmin=c - 1e-5 * d, xmax=c + 1e-5 * d, ymin=ymin, ymax=ymax, aspect_ratio="automatic", color=color, legend_label=legend)  # Add an extra plot outside the visible frame because implicit plots are buggy: their legend does not show (https://trac.sagemath.org/ticket/15903)
 
 Rx = PolynomialRing(RDF,'x')
 

lmfdb/hecke_algebras/main.py

@@ -42,8 +42,8 @@ def hecke_algebras_render_webpage():
         weight_list = list(range(2, 20, 2))
         lvl_list_endpoints = [1, 100, 200, 300, 400, 500]
         lvl_list = ["%s-%s" % (start, end - 1) for start, end in zip(lvl_list_endpoints[:-1], lvl_list_endpoints[1:])]
-        favourite_list = ["1.12.1","139.2.1","239.2.1","9.16.1"]
-        info = {'lvl_list': lvl_list,'wt_list': weight_list, 'favourite_list': favourite_list}
+        favorite_list = ["1.12.1","139.2.1","239.2.1","9.16.1"]
+        info = {'lvl_list': lvl_list,'wt_list': weight_list, 'favorite_list': favorite_list}
         credit = hecke_algebras_credit
         t = 'Hecke algebras'
         bread = [('HeckeAlgebra', url_for(".hecke_algebras_render_webpage"))]

lmfdb/hecke_algebras/templates/hecke_algebras-index.html

@@ -40,7 +40,7 @@ <h2> Browse {{ KNOWL('hecke_algebra.definition', title='Hecke Algebras') }} for
 
 <p>
 Some of our favorite {{ KNOWL('hecke_algebra.definition', title='Hecke Algebras') }}:
-{% for rnge in info.favourite_list %}
+{% for rnge in info.favorite_list %}
 <a href="?label={{rnge}}">&nbsp; {{rnge}} &nbsp;</a>
 {% endfor %}
 </p>

lmfdb/number_fields/draw_spectrum.py

@@ -66,9 +66,9 @@ def draw_spec(frobs, local_alg_dict, colors=True, rings=False, num_primes=100, g
     bottom_line = round((3/4)*height)
 
     # fraction of height of center line around which the primes in spec are centered
-    centre_ratio = 1/2 if gaga else 1/4
+    center_ratio = 1/2 if gaga else 1/4
     # y-coordinate of Spec O_K
-    y_centre = round(centre_ratio*height)
+    y_center = round(center_ratio*height)
 
     line_thickness = .75
 
@@ -91,10 +91,10 @@ def draw_spec(frobs, local_alg_dict, colors=True, rings=False, num_primes=100, g
         x_coord = (n+1)*x_spread
         if l == [0]:
             coords.append(ram_coords(
-                local_alg_dict, p, x_coord, y_centre, y_spread))
+                local_alg_dict, p, x_coord, y_center, y_spread))
         else:
             coords.append(unram_coords(
-                l, x_coord, y_centre, y_spread))
+                l, x_coord, y_center, y_spread))
 
     # draw Spec Z line at the bottom
     if not gaga:
@@ -108,7 +108,7 @@ def draw_spec(frobs, local_alg_dict, colors=True, rings=False, num_primes=100, g
                 y2=bottom_line))
 
         # a dashed line afterwards to signify generic fiber
-        for y in (bottom_line, y_centre):
+        for y in (bottom_line, y_center):
             elements.append(
                 svg.Line(
                     stroke="black",
@@ -129,7 +129,7 @@ def draw_spec(frobs, local_alg_dict, colors=True, rings=False, num_primes=100, g
                 text_anchor="middle"))
 
     # draw curves between primes - do this first so points drawn over curve
-    nextpts = coords if gaga else coords + [[Point(width-2*x_spread, y_centre)]]
+    nextpts = coords if gaga else coords + [[Point(width-2*x_spread, y_center)]]
     for n in range(len(nextpts)-1):
         for pt_this in coords[n]:
             for pt_next in nextpts[n + 1]:
@@ -184,7 +184,7 @@ def draw_gaga(frobs, local_alg_dict, colors=True) -> svg.SVG:
     return draw_spec(frobs, local_alg_dict, colors=colors, gaga=True)
 
 
-def unram_coords(frob_cycle_list, x_coord, y_centre, spread) -> list:
+def unram_coords(frob_cycle_list, x_coord, y_center, spread) -> list:
     """
     Given list of Frobenius cycle describing a fixed fiber
     with no ramification, evenly spread points.
@@ -195,19 +195,19 @@ def unram_coords(frob_cycle_list, x_coord, y_centre, spread) -> list:
     N = sum(l[1] for l in frob_cycle_list)
     if N == 1:
         cyc_len = frob_cycle_list[0][0]
-        return [Point(x_coord, y_centre, cyc_len)]
+        return [Point(x_coord, y_center, cyc_len)]
     point_list = []
     point_index = 0         # total index of point
     for cyc_len, num_repeats in frob_cycle_list:
         for _ in range(num_repeats):
             y_offset = round(spread * (2 * point_index / (N - 1) - 1))
-            point = Point(x_coord, y_centre - y_offset, cyc_len)
+            point = Point(x_coord, y_center - y_offset, cyc_len)
             point_list.append(point)
             point_index += 1
     return point_list
 
 
-def ram_coords(local_alg_dict, p, x_coord, y_centre, spread, deg=1):
+def ram_coords(local_alg_dict, p, x_coord, y_center, spread, deg=1):
     """ Given `local_alg_dict` as defined in web_number_field.py, and a prime `p`,
     extract the points in the ramified fiber
     """
@@ -225,7 +225,7 @@ def ram_coords(local_alg_dict, p, x_coord, y_centre, spread, deg=1):
             y_offset = round(spread * (2 * i / (N - 1) - 1))
         else:
             y_offset = 0
-        point = Point(x_coord, y_centre - y_offset, residue_deg, hsl_color(ram_index, max_ram_index))
+        point = Point(x_coord, y_center - y_offset, residue_deg, hsl_color(ram_index, max_ram_index))
         point_list.append(point)
 
     return point_list

lmfdb/sato_tate_groups/test_st.py

@@ -100,7 +100,7 @@ def test_trace_zero_density(self):
         L = self.tc.get('/SatoTateGroup/?trace_zero_density=19/24')
         assert '1.4.F.24.14a' in L.get_data(as_text=True)
 
-    def test_favourites(self):
+    def test_favorites(self):
         for label in [ '1.2.1.2.1a','1.2.3.1.1a', '1.4.1.12.4d', '1.4.3.6.2a', '1.4.6.1.1a', '1.4.10.1.1a' ]:
             L = self.tc.get('/SatoTateGroup/'+label, follow_redirects=True)
             assert "Moment sequences" in L.get_data(as_text=True)

lmfdb/tensor_products/galois_reps.py

@@ -543,7 +543,7 @@ def algebraic_coefficients(self, number_of_terms):
         else:
             raise ValueError("You asked for a type that we don't have")
 
-    def renormalise_coefficients(self):
+    def renormalize_coefficients(self):
         """
         This turns a list of algebraically normalized coefficients
         as above into a list of automorphically normalized,
@@ -600,7 +600,7 @@ def lfunction(self):
         # take a lot of time. We cut it down and print a warning
         number_of_terms = min(self.numcoeff, self.besancon_bound)
         self.dirichlet_coefficients = self.algebraic_coefficients(number_of_terms+1)
-        self.renormalise_coefficients()
+        self.renormalize_coefficients()
 
         self.texname = "L(s,\\rho)"
         self.texnamecompleteds = "\\Lambda(s,\\rho)"

lmfdb/utils/search_wrapper.py

@@ -238,7 +238,7 @@ def make_query(self, info, random=False):
             one_per = [one_per]
         return query, sort, table, title, err_title, template, one_per
 
-    def query_cancelled_error(
+    def query_canceled_error(
         self, info, query, err, err_title, template, template_kwds
     ):
         ctx = ctx_proc_userdata()
@@ -421,7 +421,7 @@ def __call__(self, info):
                     split_ors=split_ors,
                 )
         except QueryCanceledError as err:
-            return self.query_cancelled_error(
+            return self.query_canceled_error(
                 info, query, err, err_title, template, template_kwds
             )
         except SearchParsingError as err:
@@ -644,7 +644,7 @@ def axis_is_boolean(name):
                 one_per=one_per,
             )
         except QueryCanceledError as err:
-            return self.query_cancelled_error(
+            return self.query_canceled_error(
                 info, query, err, err_title, template, template_kwds
             )
         except SearchParsingError as err:
@@ -784,7 +784,7 @@ def __call__(self, info):
                         tuple(key[i] for i in perm): val for (key, val) in res.items()
                     }
         except QueryCanceledError as err:
-            return self.query_cancelled_error(
+            return self.query_canceled_error(
                 info, query, err, err_title, template, template_kwds
             )
         else:
@@ -869,7 +869,7 @@ def __call__(self, info):
                 one_per=one_per,
             )
         except QueryCanceledError as err:
-            return self.query_cancelled_error(
+            return self.query_canceled_error(
                 info, query, err, err_title, template, template_kwds
             )
         except SearchParsingError as err: