minor pep8 details in various cython files

Author: fchapoton

src/sage/algebras/quatalg/quaternion_algebra_element.pyx

@@ -704,7 +704,7 @@ cdef class QuaternionAlgebraElement_abstract(AlgebraElement):
         """
         if base_map is None:
             base_map = lambda v: v
-        return sum(base_map(c)*g for c,g in zip(self, [1] + list(im_gens)))
+        return sum(base_map(c) * g for c, g in zip(self, [1] + list(im_gens)))
 
 
 cdef class QuaternionAlgebraElement_generic(QuaternionAlgebraElement_abstract):

src/sage/coding/ag_code_decoders.pyx

@@ -1800,7 +1800,7 @@ cdef class Decoder_K():
             h = [W.zero() for k in range(gamma)]
             for j in range(code_length):
                 t = delta[j]
-                h[<Py_ssize_t> t[1]] += matinv[i,j] * x**(<int> t[0])
+                h[<Py_ssize_t> t[1]] += matinv[i, j] * x**(<int> t[0])
             vecs[i] = vector(h)
 
 
@@ -2032,7 +2032,7 @@ cdef class EvaluationAGCodeDecoder_K(Decoder_K):
                 f = yR[i] * yRbar[j]
                 v = vec_form(f)
                 self._exponents((<int> dR[i]) + (<int> dRbar[j]), &sk, &si)
-                coeff_mat[i,j] = v[si][sk]
+                coeff_mat[i, j] = v[si][sk]
                 (<list> mul_mat[i])[j] = v
 
         if verbose:
@@ -2287,7 +2287,7 @@ cdef class DifferentialAGCodeDecoder_K(Decoder_K):
                 f = yR[i] * wWbar[j]
                 v = vec_form(f)
                 self._exponents((<int> dR[i]) + (<int> dWbar[j]), &sk, &si)
-                coeff_mat[i,j] = v[si][sk]
+                coeff_mat[i, j] = v[si][sk]
                 (<list> mul_mat[i])[j] = v
 
         if verbose:

src/sage/coding/codecan/codecan.pyx

@@ -756,7 +756,7 @@ cdef class PartitionRefinementLinearCode(PartitionRefinement_generic):
         This graph will be later used in the refinement procedures.
         """
         cdef FFSS_projPoint iter = FFSS_projPoint(self._matrix)
-        cdef mp_bitcnt_t i,j
+        cdef mp_bitcnt_t i, j
 
         ambient_space = (self._matrix.base_ring()) ** (self._n)
         weights2size = [0] * (self.len() + 1)

src/sage/crypto/boolean_function.pyx

@@ -288,11 +288,11 @@ cdef class BooleanFunction(SageObject):
         if isinstance(x, str):
             L = ZZ(len(x))
             if L.is_power_of(2):
-                x = ZZ("0x"+x).digits(base=2,padto=4*L)
+                x = ZZ("0x" + x).digits(base=2, padto=4*L)
             else:
                 raise ValueError("the length of the truth table must be a power of 2")
         from types import GeneratorType
-        if isinstance(x, (list,tuple,GeneratorType)):
+        if isinstance(x, (list, tuple, GeneratorType)):
             # initialisation from a truth table
 
             # first, check the length
@@ -336,14 +336,15 @@ cdef class BooleanFunction(SageObject):
                     FiniteField_givaro = ()
                 if isinstance(K, FiniteField_givaro):  # the ordering is not the same in this case
                     for u in K:
-                        bitset_set_to(self._truth_table, ZZ(u._vector_().list(),2), (x(u)).trace())
+                        bitset_set_to(self._truth_table,
+                                      ZZ(u._vector_().list(), 2), (x(u)).trace())
                 else:
-                    for i,u in enumerate(K):
+                    for i, u in enumerate(K):
                         bitset_set_to(self._truth_table, i, (x(u)).trace())
         elif isinstance(x, BooleanFunction):
             self._nvariables = x.nvariables()
             bitset_init(self._truth_table, <mp_bitcnt_t> (1<<self._nvariables))
-            bitset_copy(self._truth_table,(<BooleanFunction>x)._truth_table)
+            bitset_copy(self._truth_table, (<BooleanFunction>x)._truth_table)
         else:
             raise TypeError("unable to init the Boolean function")
 
@@ -507,7 +508,7 @@ cdef class BooleanFunction(SageObject):
         bitset_copy(anf, self._truth_table)
         reed_muller(anf.bits, ZZ(anf.limbs).exact_log(2))
         from sage.rings.polynomial.pbori.pbori import BooleanPolynomialRing
-        R = BooleanPolynomialRing(self._nvariables,"x")
+        R = BooleanPolynomialRing(self._nvariables, "x")
         G = R.gens()
         P = R(0)
 
@@ -517,7 +518,7 @@ cdef class BooleanFunction(SageObject):
                 inf = i*sizeof(long)*8
                 sup = min((i+1)*sizeof(long)*8, (1<<self._nvariables))
                 for j in range(inf, sup):
-                    if bitset_in(anf,j):
+                    if bitset_in(anf, j):
                         m = R(1)
                         for k in range(self._nvariables):
                             if (j>>k)&1:
@@ -592,9 +593,9 @@ cdef class BooleanFunction(SageObject):
         if format == 'bin':
             return tuple(self)
         if format == 'int':
-            return tuple(map(int,self))
+            return tuple(map(int, self))
         if format == 'hex':
-            S = ZZ(self.truth_table(),2).str(16)
+            S = ZZ(self.truth_table(), 2).str(16)
             S = "0"*((1<<(self._nvariables-2)) - len(S)) + S
             return S
         raise ValueError("unknown output format")
@@ -713,7 +714,7 @@ cdef class BooleanFunction(SageObject):
             (0, -4, 0, 4, 0, 4, 0, 4)
         """
         cdef long *temp
-        cdef mp_bitcnt_t i,n
+        cdef mp_bitcnt_t i, n
 
         if self._walsh_hadamard_transform is None:
             n = self._truth_table.size
@@ -1010,7 +1011,7 @@ cdef class BooleanFunction(SageObject):
         """
         # NOTE: this is a toy implementation
         from sage.rings.polynomial.polynomial_ring_constructor import BooleanPolynomialRing_constructor
-        R = BooleanPolynomialRing_constructor(self._nvariables,'x')
+        R = BooleanPolynomialRing_constructor(self._nvariables, 'x')
         G = R.gens()
         r = [R(1)]
 
@@ -1022,7 +1023,8 @@ cdef class BooleanFunction(SageObject):
 
         from sage.matrix.constructor import Matrix
         from sage.arith.misc import binomial
-        M = Matrix(GF(2), sum(binomial(self._nvariables,i) for i in range(d+1)), len(s))
+        M = Matrix(GF(2), sum(binomial(self._nvariables, i)
+                              for i in range(d+1)), len(s))
 
         cdef long i
         for i in range(1, d+1):
@@ -1036,23 +1038,20 @@ cdef class BooleanFunction(SageObject):
         cdef long j
         cdef mp_bitcnt_t v
 
-        for i,m in enumerate(r):
+        for i, m in enumerate(r):
             t = BooleanFunction(m)
-            for j,v in enumerate(s):
+            for j, v in enumerate(s):
                 sig_check()
-                M[i,j] = bitset_in(t._truth_table,v)
+                M[i, j] = bitset_in(t._truth_table, v)
 
         kg = M.kernel().gens()
 
         if kg:
-            res = sum([kg[0][i]*ri for i,ri in enumerate(r)])
+            res = sum([kg[0][i]*ri for i, ri in enumerate(r)])
         else:
             res = None
 
-        if dim:
-            return res, len(kg)
-        else:
-            return res
+        return res, len(kg) if dim else res
 
     def algebraic_immunity(self, annihilator=False):
         """
@@ -1483,5 +1482,5 @@ def random_boolean_function(n):
     T[0] = B._truth_table[0]
     for i in range(T.limbs):
         sig_check()
-        T.bits[i] = r.randrange(0,Integer(1)<<(sizeof(unsigned long)*8))
+        T.bits[i] = r.randrange(0, Integer(1)<<(sizeof(unsigned long)*8))
     return B

src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pyx

@@ -1469,12 +1469,12 @@ cdef class CombinatorialPolyhedron(SageObject):
             return tuple(
                     ((f(self._ridges.get(i).first),) + self.equations(),
                      (f(self._ridges.get(i).second),) + self.equations())
-                    for i in range (n_ridges))
+                    for i in range(n_ridges))
         else:
             return tuple(
                     (f(self._ridges.get(i).first),
                      f(self._ridges.get(i).second))
-                    for i in range (n_ridges))
+                    for i in range(n_ridges))
 
     @cached_method
     def facet_adjacency_matrix(self, algorithm=None):

src/sage/modules/vector_integer_sparse.pyx

@@ -66,11 +66,11 @@ cdef Py_ssize_t mpz_binary_search0(mpz_t* v, Py_ssize_t n, mpz_t x) noexcept:
     j = n-1
     while i<=j:
         if i == j:
-            if mpz_cmp(v[i],x) == 0:
+            if mpz_cmp(v[i], x) == 0:
                 return i
             return -1
         k = (i+j)/2
-        c = mpz_cmp(v[k],x)
+        c = mpz_cmp(v[k], x)
         if c > 0:       # v[k] > x
             j = k-1
         elif c < 0:     # v[k] < x
@@ -103,9 +103,9 @@ cdef Py_ssize_t mpz_binary_search(mpz_t* v, Py_ssize_t n, mpz_t x, Py_ssize_t* i
         return -1
     i = 0
     j = n-1
-    while i<=j:
+    while i <= j:
         if i == j:
-            c = mpz_cmp(v[i],x)
+            c = mpz_cmp(v[i], x)
             if c == 0:          # v[i] == x
                 ins[0] = i
                 return i

src/sage/modules/vector_mod2_dense.pyx

@@ -515,7 +515,7 @@ cdef class Vector_mod2_dense(free_module_element.FreeModuleElement):
         K = self.base_ring()
         z = K.zero()
         o = K.one()
-        cdef list switch = [z,o]
+        cdef list switch = [z, o]
         for i in range(d):
             v[i] = switch[mzd_read_bit(self._entries, 0, i)]
         return v

src/sage/modules/vector_rational_sparse.pyx

@@ -73,11 +73,11 @@ cdef Py_ssize_t mpq_binary_search0(mpq_t* v, Py_ssize_t n, mpq_t x) noexcept:
     j = n-1
     while i<=j:
         if i == j:
-            if mpq_equal(v[i],x):
+            if mpq_equal(v[i], x):
                 return i
             return -1
         k = (i+j)/2
-        c = mpq_cmp(v[k],x)
+        c = mpq_cmp(v[k], x)
         if c > 0:       # v[k] > x
             j = k-1
         elif c < 0:     # v[k] < x
@@ -112,7 +112,7 @@ cdef Py_ssize_t mpq_binary_search(mpq_t* v, Py_ssize_t n, mpq_t x, Py_ssize_t* i
     j = n-1
     while i<=j:
         if i == j:
-            c = mpq_cmp(v[i],x)
+            c = mpq_cmp(v[i], x)
             if c == 0:          # v[i] == x
                 ins[0] = i
                 return i
@@ -147,7 +147,7 @@ cdef int mpq_vector_get_entry(mpq_t ans, mpq_vector* v, Py_ssize_t n) except -1:
     cdef Py_ssize_t m
     m = binary_search0(v.positions, v.num_nonzero, n)
     if m == -1:
-        mpq_set_si(ans, 0,1)
+        mpq_set_si(ans, 0, 1)
         return 0
     mpq_set(ans, v.entries[m])
     return 0
@@ -279,7 +279,7 @@ cdef int add_mpq_vector_init(mpq_vector* sum,
 
     mpq_init(tmp)
     # Do not do the multiply if the multiple is 1.
-    do_multiply = mpq_cmp_si(multiple, 1,1)
+    do_multiply = mpq_cmp_si(multiple, 1, 1)
 
     z = sum
     # ALGORITHM:

src/sage/modules/with_basis/indexed_element.pyx

@@ -858,7 +858,7 @@ cdef class IndexedFreeModuleElement(ModuleElement):
         zero = free_module.base_ring().zero()
         if sparse:
             if order is None:
-                order = {k: i for i,k in enumerate(self._parent.get_order())}
+                order = {k: i for i, k in enumerate(self._parent.get_order())}
             return free_module.element_class(free_module,
                                              {order[k]: c for k, c in d.items()},
                                              coerce=True, copy=False)

src/sage/rings/complex_mpc.pyx

@@ -1546,7 +1546,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef RealNumber x
         x = RealNumber(self._parent._real_field())
-        mpc_abs (x.value, self.value, (<RealField_class>x._parent).rnd)
+        mpc_abs(x.value, self.value, (<RealField_class>x._parent).rnd)
         return x
 
     def norm(self):
@@ -1649,7 +1649,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_cos (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_cos(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def sin(self):
@@ -1669,7 +1669,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_sin (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_sin(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def tan(self):
@@ -1689,7 +1689,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_tan (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_tan(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def cosh(self):
@@ -1709,7 +1709,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_cosh (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_cosh(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def sinh(self):
@@ -1729,7 +1729,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_sinh (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_sinh(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def tanh(self):
@@ -1749,7 +1749,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_tanh (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_tanh(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def arccos(self):
@@ -1765,7 +1765,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_acos (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_acos(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def arcsin(self):
@@ -1781,7 +1781,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_asin (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_asin(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def arctan(self):
@@ -1797,7 +1797,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_atan (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_atan(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def arccosh(self):
@@ -1813,7 +1813,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_acosh (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_acosh(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def arcsinh(self):
@@ -1829,7 +1829,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_asinh (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_asinh(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def arctanh(self):
@@ -1845,7 +1845,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_atanh (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_atanh(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def coth(self):
@@ -2028,7 +2028,7 @@ cdef class MPComplexNumber(sage.structure.element.FieldElement):
         """
         cdef MPComplexNumber z
         z = self._new()
-        mpc_sqr (z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
+        mpc_sqr(z.value, self.value, (<MPComplexField_class>self._parent).__rnd)
         return z
 
     def sqrt(self):