fix E202

Author: GiacomoPope

pyproject.toml

@@ -46,11 +46,6 @@ build-backend = "mesonpy"
 #            and we ignore it to avoid needing additional indentation after
 #            long logical statements.
 #
-# E202 whitespace before '}'
-# Reasoning: this rule flags up format strings f"{x = }". This is discussed
-#            here: https://github.com/PyCQA/pycodestyle/issues/1201, as we
-#            prefer printing whitespace around =, we disable this rule.
-#
 # E501 line too long (128 > 120 characters)
 # Reasoning: this is a work in progress and will be enforced once a line length
 #            and refactor has taken place. See issue #214
@@ -63,7 +58,7 @@ build-backend = "mesonpy"
 # Reasoning: this is a work in progress and will be enforced after #210 is
 #            resolved.
 max-line-length = 120
-ignore = ['E129','E202','E501','E741','E743']
+ignore = ['E129','E501','E741','E743']
 exclude = 'src/flint/flintlib/.*'
 
 [tool.spin]

src/flint/test/test_all.py

@@ -1921,7 +1921,7 @@ def test_fmpz_mod_poly():
     R_other = fmpz_mod_poly_ctx(F_other)
 
     assert raises(lambda: fmpz_mod_poly(1, "A"), TypeError) # Need a valid context
-    assert raises(lambda: R(R_other([1,2,3])), ValueError), f"{R(R_other([1,2,3])) = }" # moduli must match
+    assert raises(lambda: R(R_other([1,2,3])), ValueError) # moduli must match
     assert raises(lambda: R(F_other(2)), ValueError) # moduli must match
     assert raises(lambda: R([F(1), F_other(2)]), ValueError) # moduli must match
     assert raises(lambda: R([F(1), "A"]), TypeError) # need to be able to cast to fmpz_mod
@@ -2120,7 +2120,7 @@ def test_fmpz_mod_poly():
         assert raises(lambda: f % f_bad, ValueError)
         assert raises(lambda: 123 % f_bad, DomainError)
         assert raises(lambda: f % "AAA", TypeError)
-        assert raises(lambda: tuple() % f, TypeError), f'{"AAA" % f = }'
+        assert raises(lambda: tuple() % f, TypeError)
 
         assert f % 1 == 0
         assert R_test.one() % 1 == 0
@@ -2550,7 +2550,7 @@ def test_polys():
         assert P([S(1)]) == P([1]) == P(P([1])) == P(1)
 
         assert raises(lambda: P([None]), TypeError)
-        assert raises(lambda: P(object()), TypeError), f"{P(object()) = }"
+        assert raises(lambda: P(object()), TypeError)
         assert raises(lambda: P(None), TypeError)
         assert raises(lambda: P(None, None), TypeError)
         assert raises(lambda: P([1,2], None), TypeError)
@@ -2903,7 +2903,7 @@ def quick_poly():
         assert ctx.constant(1) == mpoly({(0, 0): 1}) == P(1, ctx=ctx)
 
         assert raises(lambda: P([None]), TypeError)
-        assert raises(lambda: P(object()), TypeError), f"{P(object()) = }"
+        assert raises(lambda: P(object()), TypeError)
         assert raises(lambda: P(None), TypeError)
         assert raises(lambda: P(None, None), TypeError)
         assert raises(lambda: P([1,2], None), TypeError)

src/flint/types/fmpz_mod_poly.pyx

@@ -1186,7 +1186,7 @@ cdef class fmpz_mod_poly(flint_poly):
         # For larger exponents we need to cast e to an fmpz first
         e_fmpz = any_as_fmpz(e)
         if e_fmpz is NotImplemented:
-            raise TypeError(f"exponent cannot be cast to an fmpz type: {e = }")
+            raise TypeError(f"exponent cannot be cast to an fmpz type: {e}")
 
         # To optimise powering, we precompute the inverse of the reverse of the modulus
         if mod_rev_inv is not None:
@@ -1716,7 +1716,7 @@ cdef class fmpz_mod_poly(flint_poly):
             self.val, self.ctx.mod.val
         )
         if n > n_max:
-            raise ValueError(f"Cannot deflate with {n = }, maximum allowed value is {n_max = }")
+            raise ValueError(f"Cannot deflate with n = {n}, maximum allowed value is n_max = {n_max}")
 
         res = self.ctx.new_ctype_poly()
         fmpz_mod_poly_deflate(

src/flint/types/fq_default.pyx

@@ -56,9 +56,9 @@ cdef class fq_default_ctx:
 
         # Now fq_type should be an int between 0, 5
         if not typecheck(fq_type, int):
-            raise TypeError(f"{fq_type = } is invalid")
+            raise TypeError(f"fq_type = {fq_type} is invalid")
         if fq_type < 0 or fq_type > 5:
-            raise ValueError(f"{fq_type = } should be between 0 and 5")
+            raise ValueError(f"fq_type = {fq_type} should be between 0 and 5")
 
         return fq_type
 
@@ -129,14 +129,14 @@ cdef class fq_default_ctx:
         # c_from_order expects the characteristic to be fmpz type
         prime = any_as_fmpz(p)
         if prime is NotImplemented:
-            raise TypeError(f"cannot coerce {p = } to type fmpz")
+            raise TypeError(f"cannot coerce p = {p} to type fmpz")
 
         if check_prime and not prime.is_prime():
             raise ValueError("characteristic is not prime")
 
         # the degree must be strictly positive
         if d < 1:
-            raise ValueError(f"the degree must be positive, got {d = }")
+            raise ValueError(f"the degree must be positive, got d = {d}")
 
         fq_default_ctx_init_type(self.val, (<fmpz>prime).val, d, self.var, <fq_default_type>fq_type)
         self._initialized = True

src/flint/types/fq_default_poly.pyx

@@ -47,7 +47,7 @@ cdef class fq_default_poly_ctx:
             # First coerce the list element as an fq_default type
             v = self.field.any_as_fq_default(val[i])
             if v is NotImplemented:
-                raise TypeError(f"unsupported coefficient in list: {val[i] = }, {type(val[i]) = }")
+                raise TypeError(f"unsupported coefficient in list: val[i] = {val[i]}, type(val[i] = {type(val[i])}")
 
             # Set the coefficient of the polynomial
             fq_default_poly_set_coeff(
@@ -1324,7 +1324,7 @@ cdef class fq_default_poly(flint_poly):
         """
         G, S, _ = self.xgcd(other)
         if not G.is_one():
-            raise ValueError(f"polynomial has no inverse modulo {other = }")
+            raise ValueError(f"polynomial has no inverse modulo other = {other}")
         return S
 
     # ====================================
@@ -1638,7 +1638,7 @@ cdef class fq_default_poly(flint_poly):
             self.val, self.ctx.field.val
         )
         if n > n_max:
-            raise ValueError(f"Cannot deflate with {n = }, maximum allowed value is {n_max = }")
+            raise ValueError(f"Cannot deflate with n = {n}, maximum allowed value is n_max = {n_max}")
 
         res = self.ctx.new_ctype_poly()
         fq_default_poly_deflate(

src/flint/types/nmod_poly.pyx

@@ -262,7 +262,7 @@ cdef class nmod_poly(flint_poly):
             45*x^4 + 23*x^3 + 159*x^2 + 151*x + 110
         """
         if n <= 0:
-            raise ValueError(f"{n = } must be positive")
+            raise ValueError(f"n = {n} must be positive")
 
         if self.is_zero():
             raise ValueError("cannot invert the zero element")
@@ -315,11 +315,11 @@ cdef class nmod_poly(flint_poly):
         cdef nmod_poly res
         g = any_as_nmod_poly(other, self.val.mod)
         if g is NotImplemented:
-            raise TypeError(f"cannot convert {other = } to nmod_poly")
+            raise TypeError(f"cannot convert other = {other} to nmod_poly")
 
         h = any_as_nmod_poly(modulus, self.val.mod)
         if h is NotImplemented:
-            raise TypeError(f"cannot convert {modulus = } to nmod_poly")
+            raise TypeError(f"cannot convert modulus = {modulus} to nmod_poly")
 
         if modulus.is_zero():
             raise ZeroDivisionError("cannot reduce modulo zero")
@@ -549,7 +549,7 @@ cdef class nmod_poly(flint_poly):
         # For larger exponents we need to cast e to an fmpz first
         e_fmpz = any_as_fmpz(e)
         if e_fmpz is NotImplemented:
-            raise TypeError(f"exponent cannot be cast to an fmpz type: {e = }")
+            raise TypeError(f"exponent cannot be cast to an fmpz type: {e}")
 
         # To optimise powering, we precompute the inverse of the reverse of the modulus
         if mod_rev_inv is not None: