Skip to content

Commit 22446cb

Browse files
author
Release Manager
committed
gh-36105: `sage.rings.finite_rings.element_*`: Remove unused imports <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> Likewise for the module providing the parent class. Also replace an import that is more specific than necessary, which helps for modularization. <!-- Why is this change required? What problem does it solve? --> - Part of: #29705 - Cherry-picked from: #35095 <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36105 Reported by: Matthias Köppe Reviewer(s): David Coudert
2 parents f4b2fe9 + c0bad32 commit 22446cb

File tree

4 files changed

+10
-59
lines changed

4 files changed

+10
-59
lines changed

src/sage/rings/finite_rings/element_givaro.pyx

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,16 @@ from cypari2.gen cimport Gen
6565
from cypari2.stack cimport clear_stack
6666

6767
from sage.structure.parent cimport Parent
68+
from sage.structure.element cimport Vector
6869

6970
from sage.interfaces.abc import GapElement
7071

7172
cdef object is_IntegerMod
7273
cdef object Integer
7374
cdef object Rational
74-
cdef object ConwayPolynomials
75-
cdef object conway_polynomial
7675
cdef object MPolynomial
7776
cdef object Polynomial
78-
cdef object FreeModuleElement
77+
7978

8079
cdef void late_import():
8180
"""
@@ -84,11 +83,8 @@ cdef void late_import():
8483
global is_IntegerMod, \
8584
Integer, \
8685
Rational, \
87-
ConwayPolynomials, \
88-
conway_polynomial, \
8986
MPolynomial, \
90-
Polynomial, \
91-
FreeModuleElement
87+
Polynomial
9288

9389
if is_IntegerMod is not None:
9490
return
@@ -102,20 +98,12 @@ cdef void late_import():
10298
import sage.rings.rational
10399
Rational = sage.rings.rational.Rational
104100

105-
import sage.databases.conway
106-
ConwayPolynomials = sage.databases.conway.ConwayPolynomials
107-
108-
import sage.rings.finite_rings.finite_field_constructor
109-
conway_polynomial = sage.rings.finite_rings.conway_polynomials.conway_polynomial
110-
111101
import sage.rings.polynomial.multi_polynomial_element
112102
MPolynomial = sage.rings.polynomial.multi_polynomial_element.MPolynomial
113103

114104
import sage.rings.polynomial.polynomial_element
115105
Polynomial = sage.rings.polynomial.polynomial_element.Polynomial
116106

117-
import sage.modules.free_module_element
118-
FreeModuleElement = sage.modules.free_module_element.FreeModuleElement
119107

120108
cdef class Cache_givaro(Cache_base):
121109
def __init__(self, parent, unsigned int p, unsigned int k, modulus, repr="poly", cache=False):
@@ -391,7 +379,7 @@ cdef class Cache_givaro(Cache_base):
391379
return self.parent(eval(e.replace("^", "**"),
392380
self.parent.gens_dict()))
393381

394-
elif isinstance(e, FreeModuleElement):
382+
elif isinstance(e, Vector):
395383
if self.parent.vector_space(map=False) != e.parent():
396384
raise TypeError("e.parent must match self.vector_space")
397385
ret = self._zero_element

src/sage/rings/finite_rings/element_ntl_gf2e.pyx

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ from sage.structure.richcmp cimport (richcmp,
3636
richcmp_not_equal, rich_to_bool)
3737

3838
from sage.structure.parent cimport Parent
39+
from sage.structure.element cimport Vector
3940

4041
from sage.rings.finite_rings.finite_field_base cimport FiniteField
4142

@@ -50,15 +51,10 @@ from sage.interfaces.abc import GapElement
5051

5152

5253
cdef object is_IntegerMod
53-
cdef object IntegerModRing_generic
5454
cdef object Integer
5555
cdef object Rational
56-
cdef object is_Polynomial
57-
cdef object ConwayPolynomials
58-
cdef object conway_polynomial
5956
cdef object MPolynomial
6057
cdef object Polynomial
61-
cdef object FreeModuleElement
6258
cdef object GF
6359
cdef object GF2, GF2_0, GF2_1
6460

@@ -69,15 +65,10 @@ cdef int late_import() except -1:
6965
imports.
7066
"""
7167
global is_IntegerMod, \
72-
IntegerModRing_generic, \
7368
Integer, \
7469
Rational, \
75-
is_Polynomial, \
76-
ConwayPolynomials, \
77-
conway_polynomial, \
7870
MPolynomial, \
7971
Polynomial, \
80-
FreeModuleElement, \
8172
GF, \
8273
GF2, GF2_0, GF2_1
8374

@@ -87,30 +78,15 @@ cdef int late_import() except -1:
8778
import sage.rings.finite_rings.integer_mod
8879
is_IntegerMod = sage.rings.finite_rings.integer_mod.is_IntegerMod
8980

90-
import sage.rings.finite_rings.integer_mod_ring
91-
IntegerModRing_generic = sage.rings.finite_rings.integer_mod_ring.IntegerModRing_generic
92-
9381
import sage.rings.rational
9482
Rational = sage.rings.rational.Rational
9583

96-
import sage.rings.polynomial.polynomial_element
97-
is_Polynomial = sage.rings.polynomial.polynomial_element.is_Polynomial
98-
99-
import sage.databases.conway
100-
ConwayPolynomials = sage.databases.conway.ConwayPolynomials
101-
102-
import sage.rings.finite_rings.conway_polynomials
103-
conway_polynomial = sage.rings.finite_rings.conway_polynomials.conway_polynomial
104-
10584
import sage.rings.polynomial.multi_polynomial_element
10685
MPolynomial = sage.rings.polynomial.multi_polynomial_element.MPolynomial
10786

10887
import sage.rings.polynomial.polynomial_element
10988
Polynomial = sage.rings.polynomial.polynomial_element.Polynomial
11089

111-
import sage.modules.free_module_element
112-
FreeModuleElement = sage.modules.free_module_element.FreeModuleElement
113-
11490
import sage.rings.finite_rings.finite_field_constructor
11591
GF = sage.rings.finite_rings.finite_field_constructor.FiniteField
11692
GF2 = GF(2)
@@ -313,7 +289,7 @@ cdef class Cache_ntl_gf2e(Cache_base):
313289
elif isinstance(e, str):
314290
return self._parent(eval(e.replace("^","**"),self._parent.gens_dict()))
315291

316-
elif isinstance(e, FreeModuleElement):
292+
elif isinstance(e, Vector):
317293
if self._parent.vector_space(map=False) != e.parent():
318294
raise TypeError("e.parent must match self.vector_space")
319295
ztmp = Integer(e.list(),2)

src/sage/rings/finite_rings/element_pari_ffelt.pyx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,12 @@ from sage.rings.integer cimport Integer
3232
from sage.rings.polynomial.polynomial_element import Polynomial
3333
from sage.rings.polynomial.multi_polynomial_element import MPolynomial
3434
from sage.rings.rational import Rational
35+
from sage.structure.element cimport Vector
3536
from sage.structure.richcmp cimport rich_to_bool
3637

37-
try:
38-
from sage.modules.free_module_element import FreeModuleElement
39-
except ImportError:
40-
FreeModuleElement = ()
41-
4238
from sage.interfaces.abc import GapElement
4339

40+
4441
cdef GEN _INT_to_FFELT(GEN g, GEN x) except NULL:
4542
"""
4643
Convert the t_INT `x` to an element of the field of definition of
@@ -457,7 +454,7 @@ cdef class FiniteFieldElement_pari_ffelt(FinitePolyExtElement):
457454
sig_off()
458455
raise TypeError(f"unable to convert PARI {x.type()} to finite field element")
459456

460-
elif (isinstance(x, FreeModuleElement)
457+
elif (isinstance(x, Vector)
461458
and x.parent() is self._parent.vector_space(map=False)):
462459
g = (<pari_gen>self._parent._gen_pari).g
463460
t = g[1] # codeword: t_FF_FpXQ, t_FF_Flxq, t_FF_F2xq

src/sage/rings/finite_rings/finite_field_ntl_gf2e.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,7 @@ def late_import():
3333
"""
3434
if "GF2" in globals():
3535
return
36-
global is_FiniteField, exists_conway_polynomial, conway_polynomial, Cache_ntl_gf2e, GF, GF2, is_Polynomial
37-
38-
import sage.rings.finite_rings.finite_field_base
39-
is_FiniteField = sage.rings.finite_rings.finite_field_base.is_FiniteField
40-
41-
import sage.rings.finite_rings.conway_polynomials
42-
exists_conway_polynomial = sage.rings.finite_rings.conway_polynomials.exists_conway_polynomial
43-
conway_polynomial = sage.rings.finite_rings.conway_polynomials.conway_polynomial
36+
global Cache_ntl_gf2e, GF, GF2
4437

4538
import sage.rings.finite_rings.element_ntl_gf2e
4639
Cache_ntl_gf2e = sage.rings.finite_rings.element_ntl_gf2e.Cache_ntl_gf2e
@@ -49,9 +42,6 @@ def late_import():
4942
GF = sage.rings.finite_rings.finite_field_constructor.GF
5043
GF2 = GF(2)
5144

52-
import sage.rings.polynomial.polynomial_element
53-
is_Polynomial = sage.rings.polynomial.polynomial_element.is_Polynomial
54-
5545

5646
class FiniteField_ntl_gf2e(FiniteField):
5747
"""

0 commit comments

Comments
 (0)