Skip to content

Commit 041b35f

Browse files
fchapotonfchapoton
committed
partial cython-lint cleanup in padics/
1 parent 1cf0c13 commit 041b35f

21 files changed

+104
-120
lines changed

‎src/sage/rings/padics/CA_template.pxi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ cdef class CAElement(pAdicTemplateElement):
8989
self.absprec = aprec
9090
else:
9191
self.absprec = min(aprec, val + rprec)
92-
if isinstance(x,CAElement) and x.parent() is self.parent():
92+
if isinstance(x, CAElement) and x.parent() is self.parent():
9393
cshift_notrunc(self.value, (<CAElement>x).value, 0, self.absprec, self.prime_pow, True)
9494
else:
9595
cconv(self.value, x, self.absprec, 0, self.prime_pow)
@@ -395,9 +395,8 @@ cdef class CAElement(pAdicTemplateElement):
395395
creduce(q.value, q.value, q.absprec, q.prime_pow)
396396
return q, r
397397

398-
399398
def __pow__(CAElement self, _right, dummy):
400-
"""
399+
r"""
401400
Exponentiation.
402401
403402
When ``right`` is divisible by `p` then one can get more
@@ -474,8 +473,8 @@ cdef class CAElement(pAdicTemplateElement):
474473
return base.__pow__(-_right, dummy)
475474
exact_exp = True
476475
elif self.parent() is _right.parent():
477-
## For extension elements, we need to switch to the
478-
## fraction field sometimes in highly ramified extensions.
476+
# For extension elements, we need to switch to the
477+
# fraction field sometimes in highly ramified extensions.
479478
exact_exp = (<CAElement>_right)._is_exact_zero()
480479
pright = _right
481480
else:
@@ -861,6 +860,7 @@ cdef class CAElement(pAdicTemplateElement):
861860
"""
862861
def tuple_recursive(l):
863862
return tuple(tuple_recursive(x) for x in l) if isinstance(l, Iterable) else l
863+
864864
return (self.parent(), tuple_recursive(trim_zeros(list(self.expansion()))), self.precision_absolute())
865865

866866
def _teichmuller_set_unsafe(self):
@@ -1800,6 +1800,7 @@ cdef class pAdicConvert_CA_frac_field(Morphism):
18001800
self._zero = _slots['_zero']
18011801
Morphism._update_slots(self, _slots)
18021802

1803+
18031804
def unpickle_cae_v2(cls, parent, value, absprec):
18041805
r"""
18051806
Unpickle capped absolute elements.
@@ -1834,4 +1835,3 @@ def unpickle_cae_v2(cls, parent, value, absprec):
18341835
cunpickle(ans.value, value, ans.prime_pow)
18351836
ans.absprec = absprec
18361837
return ans
1837-

‎src/sage/rings/padics/CR_template.pxi

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ cdef class CRElement(pAdicTemplateElement):
145145
else:
146146
self.relprec = min(rprec, aprec - val)
147147
self.ordp = val
148-
if isinstance(x,CRElement) and x.parent() is self.parent():
148+
if isinstance(x, CRElement) and x.parent() is self.parent():
149149
cshift_notrunc(self.unit, (<CRElement>x).unit, 0, self.relprec, self.prime_pow, True)
150150
else:
151151
cconv(self.unit, x, self.relprec, val, self.prime_pow)
@@ -678,8 +678,8 @@ cdef class CRElement(pAdicTemplateElement):
678678
return base.__pow__(-_right, dummy)
679679
exact_exp = True
680680
elif self.parent() is _right.parent():
681-
## For extension elements, we need to switch to the
682-
## fraction field sometimes in highly ramified extensions.
681+
# For extension elements, we need to switch to the
682+
# fraction field sometimes in highly ramified extensions.
683683
exact_exp = (<CRElement>_right)._is_exact_zero()
684684
pright = _right
685685
else:
@@ -732,7 +732,7 @@ cdef class CRElement(pAdicTemplateElement):
732732
return ans
733733

734734
cdef pAdicTemplateElement _lshift_c(self, long shift):
735-
"""
735+
r"""
736736
Multiplies by `\pi^{\mbox{shift}}`.
737737
738738
Negative shifts may truncate the result if the parent is not a
@@ -763,7 +763,7 @@ cdef class CRElement(pAdicTemplateElement):
763763
return ans
764764

765765
cdef pAdicTemplateElement _rshift_c(self, long shift):
766-
"""
766+
r"""
767767
Divides by ``\pi^{\mbox{shift}}``.
768768
769769
Positive shifts may truncate the result if the parent is not a
@@ -879,7 +879,6 @@ cdef class CRElement(pAdicTemplateElement):
879879
q._normalize()
880880
return q, r
881881

882-
883882
def add_bigoh(self, absprec):
884883
"""
885884
Return a new element with absolute precision decreased to
@@ -1253,6 +1252,7 @@ cdef class CRElement(pAdicTemplateElement):
12531252
"""
12541253
def tuple_recursive(l):
12551254
return tuple(tuple_recursive(x) for x in l) if isinstance(l, list) else l
1255+
12561256
return (self.parent(), tuple_recursive(trim_zeros(list(self.expansion()))), self.valuation(), self.precision_relative())
12571257

12581258
def _teichmuller_set_unsafe(self):
@@ -1506,7 +1506,7 @@ cdef class CRElement(pAdicTemplateElement):
15061506
"""
15071507
# Since we keep this element normalized there's not much to do here.
15081508
if p is not None and p != self.parent().prime():
1509-
raise ValueError('ring (%s) residue field of the wrong characteristic'%self.parent())
1509+
raise ValueError('ring (%s) residue field of the wrong characteristic' % self.parent())
15101510
if exactzero((<CRElement>self).ordp):
15111511
raise ValueError("unit part of 0 not defined")
15121512
cdef Integer val = Integer.__new__(Integer)
@@ -1968,7 +1968,7 @@ cdef class pAdicConvert_CR_QQ(RingMap):
19681968
1/5
19691969
"""
19701970
cdef Rational ans = Rational.__new__(Rational)
1971-
cdef CRElement x = _x
1971+
cdef CRElement x = _x
19721972
if x.relprec == 0:
19731973
mpq_set_ui(ans.value, 0, 1)
19741974
else:
@@ -2522,6 +2522,7 @@ cdef class pAdicConvert_CR_frac_field(Morphism):
25222522
self._zero = _slots['_zero']
25232523
Morphism._update_slots(self, _slots)
25242524

2525+
25252526
def unpickle_cre_v2(cls, parent, unit, ordp, relprec):
25262527
"""
25272528
Unpickles a capped relative element.

‎src/sage/rings/padics/FM_template.pxi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ cdef class FMElement(pAdicTemplateElement):
8484
polyt = type(self.prime_pow.modulus)
8585
self.value = <celement>polyt.__new__(polyt)
8686
cconstruct(self.value, self.prime_pow)
87-
if isinstance(x,FMElement) and x.parent() is self.parent():
87+
if isinstance(x, FMElement) and x.parent() is self.parent():
8888
cshift_notrunc(self.value, (<FMElement>x).value, 0, 0, self.prime_pow, False)
8989
else:
9090
cconv(self.value, x, self.prime_pow.ram_prec_cap, 0, self.prime_pow)
@@ -346,7 +346,6 @@ cdef class FMElement(pAdicTemplateElement):
346346
creduce(q.value, q.value, pcap, q.prime_pow)
347347
return q, r
348348

349-
350349
def __pow__(FMElement self, _right, dummy): # NOTE: dummy ignored, always use self.prime_pow.ram_prec_cap
351350
"""
352351
Exponentiation by an integer
@@ -381,7 +380,7 @@ cdef class FMElement(pAdicTemplateElement):
381380
return ans
382381

383382
cdef pAdicTemplateElement _lshift_c(self, long shift):
384-
"""
383+
r"""
385384
Multiplies self by `\pi^{shift}`.
386385
387386
If shift < -self.valuation(), digits will be truncated. See
@@ -428,7 +427,7 @@ cdef class FMElement(pAdicTemplateElement):
428427
return ans
429428

430429
cdef pAdicTemplateElement _rshift_c(self, long shift):
431-
"""
430+
r"""
432431
Divides by `\pi^{shift}`, and truncates.
433432
434433
Note that this operation will insert arbitrary digits (in
@@ -462,7 +461,7 @@ cdef class FMElement(pAdicTemplateElement):
462461
return ans
463462

464463
def add_bigoh(self, absprec):
465-
"""
464+
r"""
466465
Return a new element truncated modulo `\pi^{\mbox{absprec}}`.
467466
468467
INPUT:
@@ -1542,6 +1541,7 @@ cdef class pAdicConvert_FM_frac_field(Morphism):
15421541
self._zero = _slots['_zero']
15431542
Morphism._update_slots(self, _slots)
15441543

1544+
15451545
def unpickle_fme_v2(cls, parent, value):
15461546
"""
15471547
Unpickles a fixed-mod element.

‎src/sage/rings/padics/FP_template.pxi

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ cdef class FPElement(pAdicTemplateElement):
142142
self._set_infinity()
143143
else:
144144
self.ordp = val
145-
if isinstance(x,FPElement) and x.parent() is self.parent():
145+
if isinstance(x, FPElement) and x.parent() is self.parent():
146146
ccopy(self.unit, (<FPElement>x).unit, self.prime_pow)
147147
else:
148148
cconv(self.unit, x, self.prime_pow.ram_prec_cap, val, self.prime_pow)
@@ -584,7 +584,6 @@ cdef class FPElement(pAdicTemplateElement):
584584
q._normalize()
585585
return q, r
586586

587-
588587
def __pow__(FPElement self, _right, dummy): # NOTE: dummy ignored, always use self.prime_pow.ram_prec_cap
589588
"""
590589
Exponentiation by an integer
@@ -624,8 +623,8 @@ cdef class FPElement(pAdicTemplateElement):
624623
_right = -_right
625624
exact_exp = True
626625
elif self.parent() is _right.parent():
627-
## For extension elements, we need to switch to the
628-
## fraction field sometimes in highly ramified extensions.
626+
# For extension elements, we need to switch to the
627+
# fraction field sometimes in highly ramified extensions.
629628
exact_exp = (<FPElement>_right)._is_exact_zero()
630629
pright = _right
631630
else:
@@ -665,7 +664,7 @@ cdef class FPElement(pAdicTemplateElement):
665664
return ans
666665

667666
cdef pAdicTemplateElement _lshift_c(self, long shift):
668-
"""
667+
r"""
669668
Multiplies self by `\pi^{shift}`.
670669
671670
Negative shifts may truncate the result if the parent is not a
@@ -718,7 +717,7 @@ cdef class FPElement(pAdicTemplateElement):
718717
return ans
719718

720719
cdef pAdicTemplateElement _rshift_c(self, long shift):
721-
"""
720+
r"""
722721
Divides by `\pi^{shift}`.
723722
724723
Positive shifts may truncate the result if the parent is not a
@@ -772,7 +771,7 @@ cdef class FPElement(pAdicTemplateElement):
772771

773772
def _repr_(self, mode=None, do_latex=False):
774773
"""
775-
Returns a string representation of this element.
774+
Return a string representation of this element.
776775
777776
INPUT:
778777
@@ -794,7 +793,7 @@ cdef class FPElement(pAdicTemplateElement):
794793
return self.parent()._printer.repr_gen(self, do_latex, mode=mode)
795794

796795
def add_bigoh(self, absprec):
797-
"""
796+
r"""
798797
Return a new element truncated modulo `\pi^{\mbox{absprec}}`.
799798
800799
INPUT:
@@ -1221,7 +1220,7 @@ cdef class FPElement(pAdicTemplateElement):
12211220
ValueError: unit part of 0 and infinity not defined
12221221
"""
12231222
if p is not None and p != self.parent().prime():
1224-
raise ValueError('Ring (%s) residue field of the wrong characteristic.'%self.parent())
1223+
raise ValueError('Ring (%s) residue field of the wrong characteristic.' % self.parent())
12251224
if huge_val(self.ordp):
12261225
raise ValueError("unit part of 0 and infinity not defined")
12271226
cdef Integer valuation = PY_NEW(Integer)
@@ -1659,7 +1658,7 @@ cdef class pAdicConvert_FP_QQ(RingMap):
16591658
1/5
16601659
"""
16611660
cdef Rational ans = Rational.__new__(Rational)
1662-
cdef FPElement x = _x
1661+
cdef FPElement x = _x
16631662
if very_pos_val(x.ordp):
16641663
mpq_set_ui(ans.value, 0, 1)
16651664
elif very_neg_val(x.ordp):
@@ -2140,6 +2139,7 @@ cdef class pAdicConvert_FP_frac_field(Morphism):
21402139
self._zero = _slots['_zero']
21412140
Morphism._update_slots(self, _slots)
21422141

2142+
21432143
def unpickle_fpe_v2(cls, parent, unit, ordp):
21442144
"""
21452145
Unpickles a floating point element.

‎src/sage/rings/padics/local_generic_element.pyx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,9 @@ cdef class LocalGenericElement(CommutativeRingElement):
394394
unramified_generator = self.parent()(self.parent().residue_field().gen()).lift_to_precision()
395395
for c in islice(self.expansion(lift_mode=lift_mode), int(start), int(stop), int(k)):
396396
genpow = 1
397-
if not isinstance(c, list): c = [c] # relevant for the case of base-rings, or one-step
398-
# eisenstein extensions
397+
if not isinstance(c, list):
398+
c = [c] # relevant for the case of base-rings, or one-step
399+
# eisenstein extensions
399400
for d in c:
400401
ans += d * genpow * ppow
401402
genpow *= unramified_generator

‎src/sage/rings/padics/morphism.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ cdef class FrobeniusEndomorphism_padics(RingHomomorphism):
77
cdef long _power
88
cdef long _order
99

10-
cpdef Element _call_(self,x)
10+
cpdef Element _call_(self, x)

‎src/sage/rings/padics/morphism.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ cdef class FrobeniusEndomorphism_padics(RingHomomorphism):
157157
sage: Frob._repr_short()
158158
'Frob'
159159
"""
160-
name = self.domain().variable_name()
161160
if self._power == 0:
162161
s = "Identity"
163162
elif self._power == 1:

‎src/sage/rings/padics/padic_ZZ_pX_CA_element.pyx

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,6 @@ cdef class pAdicZZpXCAElement(pAdicZZpXElement):
12371237
cdef long self_ordp = self.valuation_c()
12381238
cdef long self_relprec = self.absprec - self_ordp
12391239
cdef long threshold # e / (p-1)
1240-
cdef long prime_long
12411240
cdef mpz_t tmp, tmp2
12421241
if mpz_fits_slong_p(self.prime_pow.prime.value) == 0:
12431242
threshold = 0
@@ -1399,7 +1398,6 @@ cdef class pAdicZZpXCAElement(pAdicZZpXElement):
13991398
"""
14001399
cdef pAdicZZpXCAElement right = <pAdicZZpXCAElement>_right
14011400
cdef pAdicZZpXCAElement ans
1402-
cdef long tmpL
14031401
cdef ZZ_pX_c tmpP
14041402
if self.absprec == 0 or right.absprec == 0:
14051403
return self._new_c(0)
@@ -1441,7 +1439,6 @@ cdef class pAdicZZpXCAElement(pAdicZZpXElement):
14411439
"""
14421440
cdef pAdicZZpXCAElement right = <pAdicZZpXCAElement>_right
14431441
cdef pAdicZZpXCAElement ans
1444-
cdef long tmpL
14451442
cdef ZZ_pX_c tmpP
14461443
if self.absprec == 0 or right.absprec == 0:
14471444
return self._new_c(0)
@@ -1824,7 +1821,7 @@ cdef class pAdicZZpXCAElement(pAdicZZpXElement):
18241821
True
18251822
"""
18261823
cdef pAdicZZpXCAElement ans
1827-
cdef long aprec, rprec
1824+
cdef long aprec
18281825
if absprec is not None and not isinstance(absprec, Integer):
18291826
absprec = Integer(absprec)
18301827
if absprec is None:
@@ -1977,9 +1974,9 @@ cdef class pAdicZZpXCAElement(pAdicZZpXElement):
19771974
cdef ZZ_pX_Modulus_c* m = self.prime_pow.get_modulus_capdiv(self.absprec)
19781975
cdef ZZ_pX_c x
19791976
ZZ_pX_SetX(x)
1980-
cdef Py_ssize_t i, j
1977+
cdef Py_ssize_t i
19811978
zero = int(0)
1982-
for i from 0 <= i < n:
1979+
for i in range(n):
19831980
curlist = cur.list()
19841981
L.extend(curlist + [zero]*(n - len(curlist)))
19851982
ZZ_pX_MulMod_pre(cur.x, cur.x, x, m[0])
@@ -2071,7 +2068,8 @@ cdef class pAdicZZpXCAElement(pAdicZZpXElement):
20712068
cdef long ordp = self.valuation_c()
20722069
cdef long rp = self.absprec - ordp
20732070
cdef long goal
2074-
if n is not None: goal = self.absprec - n
2071+
if n is not None:
2072+
goal = self.absprec - n
20752073
cdef pAdicZZpXCAElement v
20762074
if n is None:
20772075
L = []
@@ -2084,15 +2082,17 @@ cdef class pAdicZZpXCAElement(pAdicZZpXElement):
20842082
else:
20852083
v = self._new_c(rp)
20862084
cdef pAdicZZpXCAElement u = self.unit_part()
2087-
if u is self: u = self.__copy__()
2085+
if u is self:
2086+
u = self.__copy__()
20882087
while not ZZ_pX_IsZero(u.value):
20892088
v = self._new_c(rp)
20902089
self.prime_pow.teichmuller_set_c(&v.value, &u.value, rp)
20912090
if n is None:
20922091
L.append(v)
20932092
elif rp == goal:
20942093
return v
2095-
if rp == 1: break
2094+
if rp == 1:
2095+
break
20962096
ZZ_pX_sub(u.value, u.value, v.value)
20972097
rp -= 1
20982098
if self.prime_pow.e == 1:
@@ -2319,6 +2319,7 @@ cdef class pAdicZZpXCAElement(pAdicZZpXElement):
23192319
"""
23202320
return self.ext_p_list_precs(pos, self.absprec)
23212321

2322+
23222323
def make_ZZpXCAElement(parent, value, absprec, version):
23232324
"""
23242325
For pickling. Makes a ``pAdicZZpXCAElement`` with given ``parent``, ``value``, ``absprec``.

0 commit comments

Comments
 (0)