remove unused variables

fchapoton · fchapoton · commit 97e9f79e667a · 2024-08-30T21:31:49.000+02:00
diff --git a/src/flint/types/acb.pyx b/src/flint/types/acb.pyx
@@ -87,15 +87,15 @@ cdef any_as_acb_or_notimplemented(x):
         return NotImplemented
     return t
 
-"""
-cdef any_as_arb_or_acb(x):
-    if typecheck(x, arb) or typecheck(x, acb):
-        return x
-    try:
-        return arb(x)
-    except (TypeError, ValueError):
-        return acb(x)
-"""
+
+# cdef any_as_arb_or_acb(x):
+#     if typecheck(x, arb) or typecheck(x, acb):
+#         return x
+#     try:
+#         return arb(x)
+#     except (TypeError, ValueError):
+#         return acb(x)
+
 
 
 # Copied with modifications from sage/rings/complex_arb.pyx
@@ -2387,7 +2387,7 @@ cdef class acb(flint_scalar):
         of terms to add in the hypergeometric series. This is just a tuning
         parameter: a rigorous error bound is computed regardless of *n*.
         """
-        cdef long i, p, q, prec
+        cdef long i, p, q
         cdef acb_ptr aa, bb
         a = [any_as_acb(t) for t in a]
         b = [any_as_acb(t) for t in b]
diff --git a/src/flint/types/acb_mat.pyx b/src/flint/types/acb_mat.pyx
@@ -331,7 +331,6 @@ cdef class acb_mat(flint_mat):
         return u
 
     def __truediv__(s, t):
-        cdef acb_mat u
         if typecheck(s, acb_mat):
             s, t = acb_mat_coerce_scalar(s, t)
             if s is NotImplemented:
@@ -597,7 +596,6 @@ cdef class acb_mat(flint_mat):
         return u
 
     def __richcmp__(s, t, int op):
-        cdef int stype, ttype
         cdef bint res
         if not (op == 2 or op == 3):
             raise ValueError("comparing matrices")
diff --git a/src/flint/types/acb_poly.pyx b/src/flint/types/acb_poly.pyx
@@ -363,7 +363,7 @@ cdef class acb_poly(flint_poly):
             ValueError: roots() failed to converge: insufficient precision, or squareful input
 
         """
-        cdef long prec, initial_prec, target_prec, isolated, maxiter, deg, i
+        cdef long prec, initial_prec, isolated, maxiter, deg, i
         cdef acb_ptr roots
         cdef acb_poly_t tmp
         deg = s.degree()
diff --git a/src/flint/types/acb_series.pyx b/src/flint/types/acb_series.pyx
@@ -629,7 +629,7 @@ cdef class acb_series(flint_series):
         of terms to add in the hypergeometric series. This is just a tuning
         parameter: a rigorous error bound is computed regardless of *n*.
         """
-        cdef long i, p, q, prec, cap
+        cdef long i, p, q, cap
         cdef acb_poly_struct * aa
         cdef acb_poly_struct * bb
         a = [acb_series(t) for t in a]
diff --git a/src/flint/types/arb.pyx b/src/flint/types/arb.pyx
@@ -43,7 +43,7 @@ cdef arb_from_str(str s):
         raise ValueError("invalid string for arb()")
 
 cdef arb_set_mpmath_mpf(arb_t x, obj):
-    sgn, man, exp, bc = obj
+    sgn, man, exp, _ = obj
 
     if not man:
         if not exp:
@@ -2171,7 +2171,7 @@ cdef class arb(flint_scalar):
             >>> showgood(lambda: arb(5).hypgeom([1,2,3],[5,4.5,6],regularized=True), dps=25)
             3.886189282817193519132054e-5
         """
-        cdef long i, p, q, prec
+        cdef long i, p, q
         cdef arb_ptr aa, bb
         a = [any_as_arb(t) for t in a]
         b = [any_as_arb(t) for t in b]
diff --git a/src/flint/types/arb_mat.pyx b/src/flint/types/arb_mat.pyx
@@ -300,7 +300,6 @@ cdef class arb_mat(flint_mat):
         return u
 
     def __rmul__(s, t):
-        cdef arb_mat u
         c, d = arb_mat_coerce_scalar(s, t)
         if c is not NotImplemented:
             return c._scalar_mul_(d)
@@ -317,7 +316,6 @@ cdef class arb_mat(flint_mat):
         return u
 
     def __truediv__(s, t):
-        cdef arb_mat u
         s, t = arb_mat_coerce_scalar(s, t)
         if s is NotImplemented:
             return s
@@ -669,7 +667,6 @@ cdef class arb_mat(flint_mat):
         return u
 
     def __richcmp__(s, t, int op):
-        cdef int stype, ttype
         cdef bint res
         if not (op == 2 or op == 3):
             raise ValueError("comparing matrices")
diff --git a/src/flint/types/arf.pyx b/src/flint/types/arf.pyx
@@ -89,7 +89,6 @@ cdef class arf:
         return man, exp
 
     def _repr_str(self):
-        cdef fmpz man, exp
         if arf_is_zero(self.val):
             return "0.0"
         elif arf_is_finite(self.val):
diff --git a/src/flint/types/dirichlet.pyx b/src/flint/types/dirichlet.pyx
@@ -163,7 +163,6 @@ cdef class dirichlet_char(object):
         cdef fmpz m
         cdef ulong v
         m = fmpz(n) % self.G.q
-        expo = self.G.exponent()
         v = dirichlet_chi(self.G.val, self.val, fmpz_get_ui(m.val))
         if v == DIRICHLET_CHI_NULL:
             return None
diff --git a/src/flint/types/fmpq.pyx b/src/flint/types/fmpq.pyx
@@ -470,7 +470,6 @@ cdef class fmpq(flint_scalar):
         cdef int ntype = FMPZ_UNKNOWN
         cdef fmpq v
         cdef int success
-        cdef long e
 
         assert z is None
 
diff --git a/src/flint/types/fmpq_mat.pyx b/src/flint/types/fmpq_mat.pyx
@@ -233,7 +233,6 @@ cdef class fmpq_mat(flint_mat):
         return u
 
     def __mul__(s, t):
-        cdef fmpz_mat u
         if typecheck(t, fmpq_mat):
             return (<fmpq_mat>s).__mul_fmpq_mat(t)
         elif typecheck(t, fmpz_mat):
@@ -248,7 +247,6 @@ cdef class fmpq_mat(flint_mat):
             return NotImplemented
 
     def __rmul__(s, t):
-        cdef fmpz_mat u
         if typecheck(t, fmpz_mat):
             return (<fmpq_mat>s).__mul_r_fmpz_mat(t)
         else:
@@ -433,7 +431,6 @@ cdef class fmpq_mat(flint_mat):
             60
         """
         cdef fmpz_mat num
-        cdef fmpz_den
         num = fmpz_mat(self.nrows(), self.ncols())
         den = fmpz()
         fmpq_mat_get_fmpz_mat_matwise(num.val, den.val, self.val)
diff --git a/src/flint/types/fmpq_mpoly.pyx b/src/flint/types/fmpq_mpoly.pyx
@@ -609,7 +609,7 @@ cdef class fmpq_mpoly(flint_mpoly):
             fmpq_mpoly res
             fmpq_mpoly_ctx res_ctx
             fmpq_mpoly_vec C
-            slong i, nvars = self.ctx.nvars(), nargs = len(args)
+            slong nvars = self.ctx.nvars(), nargs = len(args)
 
         if nargs < nvars:
             raise ValueError("not enough arguments provided")
diff --git a/src/flint/types/fmpq_poly.pyx b/src/flint/types/fmpq_poly.pyx
@@ -287,14 +287,12 @@ cdef class fmpq_poly(flint_poly):
         return r
 
     def __floordiv__(s, t):
-        cdef fmpq_poly r
         t = any_as_fmpq_poly(t)
         if t is NotImplemented:
             return t
         return s._floordiv_(t)
 
     def __rfloordiv__(s, t):
-        cdef fmpq_poly r
         t = any_as_fmpq_poly(t)
         if t is NotImplemented:
             return t
@@ -309,14 +307,12 @@ cdef class fmpq_poly(flint_poly):
         return r
 
     def __mod__(s, t):
-        cdef fmpq_poly r
         t = any_as_fmpq_poly(t)
         if t is NotImplemented:
             return t
         return s._mod_(t)
 
     def __rmod__(s, t):
-        cdef fmpq_poly r
         t = any_as_fmpq_poly(t)
         if t is NotImplemented:
             return t
diff --git a/src/flint/types/fmpz.pyx b/src/flint/types/fmpz.pyx
@@ -69,7 +69,6 @@ cdef class fmpz(flint_scalar):
         fmpz_clear(self.val)
 
     def __init__(self, *args):
-        cdef long x
         if not args:
             return
         elif len(args) != 1:
@@ -123,7 +122,6 @@ cdef class fmpz(flint_scalar):
 
     def __richcmp__(s, t, int op):
         cdef bint res = 0
-        cdef long tl
         cdef fmpz_struct tval[1]
         cdef fmpz_struct * sval
         cdef int ttype
@@ -1019,7 +1017,6 @@ cdef class fmpz(flint_scalar):
         ttype = fmpz_set_any_ref(tval, other)
         if ttype == FMPZ_UNKNOWN:
             raise TypeError("input must be an integer")
-        u = fmpz.__new__(fmpz)
         v = fmpz_jacobi(self.val, tval)
         if ttype == FMPZ_TMP:
             fmpz_clear(tval)
diff --git a/src/flint/types/fmpz_mat.pyx b/src/flint/types/fmpz_mat.pyx
@@ -252,7 +252,6 @@ cdef class fmpz_mat(flint_mat):
         cdef fmpz_mat u
         cdef fmpz_mat_struct *sval
         cdef fmpz_mat_struct *tval
-        cdef int ttype
         if typecheck(t, fmpz_mat):
             sval = &(<fmpz_mat>s).val[0]
             tval = &(<fmpz_mat>t).val[0]
diff --git a/src/flint/types/fmpz_mod.pyx b/src/flint/types/fmpz_mod.pyx
@@ -341,8 +341,6 @@ cdef class fmpz_mod(flint_scalar):
             >>> g.discrete_log(a)
             123
         """
-        cdef bint is_prime
-
         # Ensure that the modulus is prime
         if not self.ctx.is_prime():
             raise NotImplementedError("algorithm assumes modulus is prime")
diff --git a/src/flint/types/fmpz_mod_mat.pyx b/src/flint/types/fmpz_mod_mat.pyx
@@ -408,47 +408,37 @@ cdef class fmpz_mod_mat(flint_mat):
 
     def __add__(self, other):
         """``M + N``: Add two matrices."""
-        cdef fmpz_mod_mat o
         other = self._as_fmpz_mod_mat(other)
         if other is NotImplemented:
             return NotImplemented
-        o = other
         return self._add(other)
 
     def __radd__(self, other):
         """``N + M``: Add two matrices."""
-        cdef fmpz_mod_mat o
         other = self._as_fmpz_mod_mat(other)
         if other is NotImplemented:
             return NotImplemented
-        o = other
         return other._add(self)
 
     def __sub__(self, other):
         """``M - N``: Subtract two matrices."""
-        cdef fmpz_mod_mat o
         other = self._as_fmpz_mod_mat(other)
         if other is NotImplemented:
             return NotImplemented
-        o = other
         return self._sub(other)
 
     def __rsub__(self, other):
         """``N - M``: Subtract two matrices."""
-        cdef fmpz_mod_mat o
         other = self._as_fmpz_mod_mat(other)
         if other is NotImplemented:
             return NotImplemented
-        o = other
         return other._sub(self)
 
     def __mul__(self, other):
         """``M * N``: Multiply two matrices."""
-        cdef fmpz_mod_mat o
         cdef fmpz_mod e
         other_mat = self._as_fmpz_mod_mat(other, same_shape=False)
         if other_mat is not NotImplemented:
-            o = other_mat
             return self._matmul(other_mat)
         other_scalar = self.ctx.any_as_fmpz_mod(other)
         if other_scalar is not NotImplemented:
@@ -461,7 +451,6 @@ cdef class fmpz_mod_mat(flint_mat):
         cdef fmpz_mod e
         other_mat = self._as_fmpz_mod_mat(other)
         if other_mat is not NotImplemented:
-            o = other_mat
             return other_mat._matmul(self)
         other_scalar = self.ctx.any_as_fmpz_mod(other)
         if other_scalar is not NotImplemented:
diff --git a/src/flint/types/fmpz_mod_mpoly.pyx b/src/flint/types/fmpz_mod_mpoly.pyx
@@ -685,7 +685,7 @@ cdef class fmpz_mod_mpoly(flint_mpoly):
             fmpz_mod_mpoly res
             fmpz_mod_mpoly_ctx res_ctx
             fmpz_mod_mpoly_vec C
-            slong i, nvars = self.ctx.nvars(), nargs = len(args)
+            slong nvars = self.ctx.nvars(), nargs = len(args)
 
         if nargs != nvars:
             raise ValueError("number of generators does not match number of arguments")
diff --git a/src/flint/types/fmpz_mod_poly.pyx b/src/flint/types/fmpz_mod_poly.pyx
@@ -180,7 +180,7 @@ cdef class fmpz_mod_poly_ctx:
                 val_fmpz = any_as_fmpz(val[i])
                 if val_fmpz is NotImplemented:
                     fmpz_clear(x)
-                    raise TypeError(f"unsupported coefficient in list")
+                    raise TypeError("unsupported coefficient in list")
                 fmpz_mod_poly_set_coeff_fmpz(
                     poly, i, (<fmpz>(val_fmpz)).val, self.mod.val
                 )
@@ -438,7 +438,7 @@ cdef class fmpz_mod_poly(flint_poly):
             return NotImplemented
 
         if other == 0:
-            raise ZeroDivisionError(f"Cannot divide by zero")
+            raise ZeroDivisionError("Cannot divide by zero")
         elif not other.is_unit():
             raise DomainError(f"Cannot divide by {other} modulo {self.ctx.modulus()}")
 
@@ -485,7 +485,7 @@ cdef class fmpz_mod_poly(flint_poly):
             raise TypeError(f"Cannot convert {right} to `fmpz_mod_poly` type.")
 
         if right == 0:
-            raise ZeroDivisionError(f"Cannot divide by zero")
+            raise ZeroDivisionError("Cannot divide by zero")
 
         res = self.ctx.new_ctype_poly()
         check = fmpz_mod_poly_divides(
@@ -522,7 +522,7 @@ cdef class fmpz_mod_poly(flint_poly):
         lc = right.leading_coefficient()
 
         if lc.is_zero():
-            raise ZeroDivisionError(f"Cannot divide by zero")
+            raise ZeroDivisionError("Cannot divide by zero")
         elif not lc.is_unit():
             raise DomainError(f"The leading term of {right} must be a unit modulo N")
 
@@ -642,7 +642,7 @@ cdef class fmpz_mod_poly(flint_poly):
                 return NotImplemented
 
         if right == 0:
-            raise ZeroDivisionError(f"Cannot reduce modulo zero")
+            raise ZeroDivisionError("Cannot reduce modulo zero")
 
         res = (<fmpz_mod_poly>left).ctx.new_ctype_poly()
         fmpz_init(f)
@@ -1059,7 +1059,7 @@ cdef class fmpz_mod_poly(flint_poly):
             )
             if not fmpz_is_one(f):
                 fmpz_clear(f)
-                raise ValueError(f"Leading coefficient is not invertible")
+                raise ValueError("Leading coefficient is not invertible")
         return res
 
     def is_irreducible(self):
diff --git a/src/flint/types/fmpz_mpoly.pyx b/src/flint/types/fmpz_mpoly.pyx
@@ -591,7 +591,7 @@ cdef class fmpz_mpoly(flint_mpoly):
             fmpz_mpoly res
             fmpz_mpoly_ctx res_ctx
             fmpz_mpoly_vec C
-            slong i, nvars = self.ctx.nvars(), nargs = len(args)
+            slong nvars = self.ctx.nvars(), nargs = len(args)
 
         if nargs < nvars:
             raise ValueError("not enough arguments provided")
diff --git a/src/flint/types/fq_default_poly.pyx b/src/flint/types/fq_default_poly.pyx
diff --git a/src/flint/types/nmod.pyx b/src/flint/types/nmod.pyx
diff --git a/src/flint/types/nmod_mat.pyx b/src/flint/types/nmod_mat.pyx
diff --git a/src/flint/types/nmod_poly.pyx b/src/flint/types/nmod_poly.pyx
