Skip to content

Commit 9ef5203

Browse files
author
Release Manager
committed
gh-40852: clean and annotate _gap_init_ -> str first add the annotation `-> str` after most `_gap_init_` methods second, remove some unused second argument, appearing only a in a few instances ### 📝 Checklist - [x] The title is concise and informative. - [x] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. URL: #40852 Reported by: Frédéric Chapoton Reviewer(s):
2 parents b1492b4 + 74ac89d commit 9ef5203

18 files changed

+50
-70
lines changed

src/sage/groups/abelian_gps/abelian_group.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ def _libgap_(self):
881881
GapPackage("polycyclic", spkg='gap_packages').require()
882882
return libgap.AbelianPcpGroup(self.gens_orders())
883883

884-
def _gap_init_(self):
884+
def _gap_init_(self) -> str:
885885
r"""
886886
Return string that defines corresponding abelian group in GAP.
887887
@@ -1404,7 +1404,7 @@ def number_of_subgroups(self, order=None):
14041404

14051405
# The group order is prod(p^e for (p,e) in primary_factors)
14061406
primary_factors = list(chain.from_iterable(
1407-
factor(ed) for ed in self.elementary_divisors()))
1407+
factor(ed) for ed in self.elementary_divisors()))
14081408
sylow_types = defaultdict(list)
14091409
for p, e in primary_factors:
14101410
sylow_types[p].append(e)
@@ -1793,7 +1793,7 @@ def __contains__(self, x):
17931793
[g.list() for g in self._gens]
17941794
)
17951795
return (vector(ZZ, x.list())
1796-
in inv_basis.stack(gens_basis).row_module())
1796+
in inv_basis.stack(gens_basis).row_module())
17971797
return False
17981798

17991799
def ambient_group(self):

src/sage/groups/class_function.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,10 @@ def __init__(self, G, values):
130130
e = self._gap_classfunction.Conductor()
131131
self._base_ring = CyclotomicField(e)
132132

133-
def _gap_init_(self):
133+
def _gap_init_(self) -> str:
134134
r"""
135135
Return a string showing how to declare / initialize ``self`` in Gap.
136+
136137
Stored in the \code{self._gap_string} attribute.
137138
138139
EXAMPLES::

src/sage/groups/free_group.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ def rank(self):
821821
"""
822822
return self.ngens()
823823

824-
def _gap_init_(self):
824+
def _gap_init_(self) -> str:
825825
"""
826826
Return the string used to construct the object in gap.
827827
@@ -831,9 +831,8 @@ def _gap_init_(self):
831831
sage: G._gap_init_()
832832
'FreeGroup(["x0", "x1", "x2"])'
833833
"""
834-
gap_names = ['"' + s + '"' for s in self._gen_names]
835-
gen_str = ', '.join(gap_names)
836-
return 'FreeGroup(['+gen_str+'])'
834+
gap_names = ('"' + s + '"' for s in self._gen_names)
835+
return 'FreeGroup([' + ', '.join(gap_names) + '])'
837836

838837
def _regina_(self, regina):
839838
r"""

src/sage/groups/perm_gps/permgroup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,10 @@ def _has_natural_domain(self):
622622
natural_domain = FiniteEnumeratedSet(list(range(1, len(domain)+1)))
623623
return domain == natural_domain
624624

625-
def _gap_init_(self):
625+
def _gap_init_(self) -> str:
626626
r"""
627627
Return a string showing how to declare / initialize ``self`` in GAP.
628+
628629
Stored in the ``self._gap_string`` attribute.
629630
630631
EXAMPLES:
@@ -638,7 +639,7 @@ def _gap_init_(self):
638639
sage: A4._gap_init_()
639640
'Group([PermList([1, 3, 4, 2]), PermList([2, 3, 1, 4])])'
640641
"""
641-
return 'Group([%s])' % (', '.join([g._gap_init_() for g in self.gens()]))
642+
return 'Group([%s])' % (', '.join(g._gap_init_() for g in self.gens()))
642643

643644
@cached_method
644645
def gap(self):

src/sage/groups/perm_gps/permgroup_element.pyx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ cdef class PermutationGroupElement(MultiplicativeGroupElement):
923923
# see sage.groups.perm_gps.permgroup.PermutationGroup_generic.gap
924924
gap = _libgap_
925925

926-
def _gap_init_(self):
926+
def _gap_init_(self) -> str:
927927
r"""
928928
Return a GAP string representation for this
929929
PermutationGroupElement.
@@ -934,9 +934,9 @@ cdef class PermutationGroupElement(MultiplicativeGroupElement):
934934
sage: g._gap_init_()
935935
'PermList([2, 3, 1, 5, 4])'
936936
"""
937-
return 'PermList(%s)' % self._gap_list()
937+
return f'PermList({self._gap_list()})'
938938

939-
def _repr_(self):
939+
def _repr_(self) -> str:
940940
r"""
941941
Return string representation of this permutation.
942942

src/sage/groups/perm_gps/permgroup_named.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ def __init__(self, domain=None):
286286
self._gens = tuple([self.element_class(g, self, check=False)
287287
for g in gens])
288288

289-
def _gap_init_(self, gap=None):
289+
def _gap_init_(self) -> str:
290290
"""
291291
Return the string used to create this group in GAP.
292292
@@ -759,7 +759,7 @@ def __init__(self, domain=None):
759759
"""
760760
PermutationGroup_symalt.__init__(self, gap_group='AlternatingGroup(%s)' % len(domain), domain=domain)
761761

762-
def _repr_(self):
762+
def _repr_(self) -> str:
763763
"""
764764
EXAMPLES::
765765
@@ -768,7 +768,7 @@ def _repr_(self):
768768
"""
769769
return "Alternating group of order %s!/2 as a permutation group" % self.degree()
770770

771-
def _gap_init_(self, gap=None):
771+
def _gap_init_(self) -> str:
772772
"""
773773
Return the string used to create this group in GAP.
774774
@@ -781,7 +781,7 @@ def _gap_init_(self, gap=None):
781781
sage: A._gap_init_()
782782
'AlternatingGroup(3)'
783783
"""
784-
return 'AlternatingGroup(%s)' % self.degree()
784+
return f'AlternatingGroup({self.degree()})'
785785

786786

787787
class CyclicPermutationGroup(PermutationGroup_unique):

src/sage/matrix/matrix1.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ cdef class Matrix(Matrix0):
9090
from sage.libs.pari import pari
9191
return pari.matrix(self._nrows, self._ncols, self._list())
9292

93-
def _gap_init_(self):
93+
def _gap_init_(self) -> str:
9494
"""
95-
Return a string defining a gap representation of ``self``.
95+
Return a string defining a GAP representation of ``self``.
9696

9797
EXAMPLES::
9898

src/sage/rings/finite_rings/element_givaro.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1619,7 +1619,7 @@ cdef class FiniteField_givaroElement(FinitePolyExtElement):
16191619
"""
16201620
return self
16211621

1622-
def _gap_init_(FiniteField_givaroElement self):
1622+
def _gap_init_(FiniteField_givaroElement self) -> str:
16231623
"""
16241624
Return a string that evaluates to the GAP representation of
16251625
this element.

src/sage/rings/finite_rings/element_ntl_gf2e.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ cdef class FiniteField_ntl_gf2eElement(FinitePolyExtElement):
11311131
"""
11321132
return self
11331133

1134-
def _gap_init_(self):
1134+
def _gap_init_(self) -> str:
11351135
r"""
11361136
Return a string that evaluates to the GAP representation of
11371137
this element.

src/sage/rings/finite_rings/element_pari_ffelt.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,7 +1359,7 @@ cdef class FiniteFieldElement_pari_ffelt(FinitePolyExtElement):
13591359
zero = "%s*a" % self._parent.characteristic()
13601360
return "subst(%s+%s,a,%s)" % (self, zero, ffgen)
13611361

1362-
def _magma_init_(self, magma):
1362+
def _magma_init_(self, magma) -> str:
13631363
"""
13641364
Return a string representing ``self`` in Magma.
13651365

@@ -1372,7 +1372,7 @@ cdef class FiniteFieldElement_pari_ffelt(FinitePolyExtElement):
13721372
km = magma(k)
13731373
return str(self).replace(k.variable_name(), km.gen(1).name())
13741374

1375-
def _gap_init_(self):
1375+
def _gap_init_(self) -> str:
13761376
r"""
13771377
Return the string representing ``self`` in GAP.
13781378

0 commit comments

Comments
 (0)