Skip to content

Commit acf17b6

Browse files
author
Matthias Koeppe
committed
sage.schemes: Consolidate imports from the same module
1 parent 4a7bfc1 commit acf17b6

File tree

10 files changed

+108
-122
lines changed

10 files changed

+108
-122
lines changed

‎src/sage/schemes/elliptic_curves/ell_finite_field.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,24 @@
2323
# https://www.gnu.org/licenses/
2424
# ****************************************************************************
2525

26+
import sage.groups.generic as generic
2627

27-
from sage.schemes.curves.projective_curve import Hasse_bounds
28-
from .ell_field import EllipticCurve_field
29-
from .constructor import EllipticCurve
30-
from sage.schemes.hyperelliptic_curves.hyperelliptic_finite_field import HyperellipticCurve_finite_field
28+
from sage.arith.functions import lcm
29+
from sage.arith.misc import binomial, GCD as gcd
30+
from sage.groups.additive_abelian.additive_abelian_wrapper import AdditiveAbelianGroupWrapper
31+
from sage.misc.cachefunc import cached_method
32+
from sage.rings.finite_rings.element_base import is_FiniteFieldElement
33+
from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
3134
from sage.rings.integer import Integer
3235
from sage.rings.integer_ring import ZZ
33-
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
34-
from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
3536
from sage.rings.polynomial.polynomial_ring import polygen
36-
from sage.rings.finite_rings.element_base import is_FiniteFieldElement
37-
import sage.groups.generic as generic
37+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
38+
from sage.schemes.curves.projective_curve import Hasse_bounds
39+
from sage.schemes.hyperelliptic_curves.hyperelliptic_finite_field import HyperellipticCurve_finite_field
40+
3841
from . import ell_point
39-
from sage.arith.misc import GCD as gcd
40-
from sage.arith.functions import lcm
41-
from sage.arith.misc import binomial
42-
from sage.misc.cachefunc import cached_method
43-
from sage.groups.additive_abelian.additive_abelian_wrapper import AdditiveAbelianGroupWrapper
42+
from .constructor import EllipticCurve
43+
from .ell_field import EllipticCurve_field
4444

4545

4646
class EllipticCurve_finite_field(EllipticCurve_field, HyperellipticCurve_finite_field):

‎src/sage/schemes/elliptic_curves/ell_modular_symbols.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,22 @@
8787
# http://www.gnu.org/licenses/
8888
#*****************************************************************************
8989

90-
from sage.structure.sage_object import SageObject
91-
from sage.modular.modsym.all import ModularSymbols
90+
from sage.arith.misc import (kronecker as kronecker_symbol,
91+
next_prime,
92+
prime_divisors,
93+
valuation)
9294
from sage.databases.cremona import parse_cremona_label
93-
94-
from sage.arith.misc import next_prime
95-
from sage.arith.misc import kronecker as kronecker_symbol
96-
from sage.arith.misc import prime_divisors
97-
from sage.arith.misc import valuation
95+
from sage.misc.verbose import verbose
96+
from sage.modular.cusps import Cusps
97+
from sage.modular.modsym.all import ModularSymbols
9898
from sage.rings.infinity import unsigned_infinity as infinity
9999
from sage.rings.integer import Integer
100-
from sage.modular.cusps import Cusps
101100
from sage.rings.integer_ring import ZZ
102101
from sage.rings.rational_field import QQ
103-
from sage.misc.verbose import verbose
102+
from sage.structure.sage_object import SageObject
103+
104+
from .constructor import EllipticCurve
104105

105-
from sage.schemes.elliptic_curves.constructor import EllipticCurve
106106

107107
oo = Cusps(infinity)
108108
zero = Integer(0)

‎src/sage/schemes/elliptic_curves/ell_rational_field.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,9 @@
7676
import sage.rings.all as rings
7777
from sage.rings.power_series_ring import PowerSeriesRing
7878
from sage.rings.infinity import Infinity as oo
79-
from sage.rings.integer_ring import ZZ
79+
from sage.rings.integer_ring import ZZ, IntegerRing
8080
from sage.rings.rational_field import QQ
8181
from sage.rings.integer import Integer
82-
from sage.rings.integer_ring import IntegerRing
8382
from sage.rings.real_mpfr import RealField
8483
from sage.rings.complex_mpfr import ComplexField
8584
from sage.rings.rational_field import RationalField

‎src/sage/schemes/elliptic_curves/gal_reps_number_field.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,17 @@
4545
# https://www.gnu.org/licenses/
4646
# ****************************************************************************
4747

48-
from sage.structure.sage_object import SageObject
49-
from sage.rings.number_field.number_field import NumberField
48+
from sage.arith.misc import legendre_symbol, primes
49+
from sage.misc.functional import cyclotomic_polynomial
5050
from sage.modules.free_module import VectorSpace
5151
from sage.rings.finite_rings.finite_field_constructor import GF
52-
from sage.misc.functional import cyclotomic_polynomial
53-
from sage.arith.misc import legendre_symbol
54-
from sage.arith.misc import primes
55-
from sage.sets.set import Set
52+
from sage.rings.infinity import Infinity
5653
from sage.rings.integer import Integer
5754
from sage.rings.integer_ring import ZZ
55+
from sage.rings.number_field.number_field import NumberField
5856
from sage.rings.rational_field import QQ
59-
from sage.rings.infinity import Infinity
57+
from sage.sets.set import Set
58+
from sage.structure.sage_object import SageObject
6059

6160

6261
class GaloisRepresentation(SageObject):

‎src/sage/schemes/elliptic_curves/heegner.py

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -92,41 +92,34 @@
9292
# https://www.gnu.org/licenses/
9393
# ****************************************************************************
9494

95-
96-
from sage.misc.misc_c import prod
97-
from sage.misc.verbose import verbose
98-
from sage.misc.cachefunc import cached_method
99-
100-
from sage.structure.sage_object import SageObject
101-
from sage.structure.richcmp import (richcmp_method, richcmp,
102-
richcmp_not_equal, rich_to_bool)
103-
10495
import sage.rings.abc
10596
import sage.rings.number_field.number_field_element
10697
import sage.rings.number_field.number_field as number_field
10798
import sage.rings.all as rings
108-
from sage.rings.integer_ring import ZZ
109-
from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
110-
from sage.rings.rational_field import QQ
99+
100+
from sage.arith.functions import lcm
101+
from sage.arith.misc import (binomial, factorial, prime_divisors,
102+
GCD as gcd, XGCD as xgcd)
103+
from sage.matrix.constructor import Matrix as matrix
104+
from sage.matrix.matrix_space import MatrixSpace
105+
from sage.misc.cachefunc import cached_method
106+
from sage.misc.misc_c import prod
107+
from sage.misc.verbose import verbose
108+
from sage.modular.modsym.p1list import P1List
111109
from sage.rings.complex_double import CDF
112-
from sage.rings.finite_rings.integer_mod_ring import IntegerModRing as Integers
113-
from sage.rings.real_mpfr import RealField
114110
from sage.rings.complex_mpfr import ComplexField
115-
from sage.rings.number_field.number_field import QuadraticField
116-
from sage.arith.misc import GCD as gcd
117-
from sage.arith.misc import XGCD as xgcd
118-
from sage.arith.functions import lcm
119-
from sage.arith.misc import prime_divisors
120-
from sage.arith.misc import factorial
121-
from sage.arith.misc import binomial
122111
from sage.rings.factorint import factor_trial_division
112+
from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
113+
from sage.rings.finite_rings.integer_mod_ring import IntegerModRing as Integers
114+
from sage.rings.integer_ring import ZZ
115+
from sage.rings.number_field.number_field import QuadraticField
116+
from sage.rings.rational_field import QQ
117+
from sage.rings.real_mpfr import RealField
123118
from sage.quadratic_forms.all import (BinaryQF,
124119
BinaryQF_reduced_representatives)
125-
from sage.matrix.matrix_space import MatrixSpace
126-
from sage.matrix.constructor import Matrix as matrix
127-
128-
from sage.modular.modsym.p1list import P1List
129-
120+
from sage.structure.sage_object import SageObject
121+
from sage.structure.richcmp import (richcmp_method, richcmp,
122+
richcmp_not_equal, rich_to_bool)
130123

131124
###############################################################################
132125
#

‎src/sage/schemes/elliptic_curves/hom_velusqrt.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,17 @@
122122
# https://www.gnu.org/licenses/
123123
# ****************************************************************************
124124

125-
from sage.structure.sequence import Sequence
126-
from sage.structure.all import coercion_model as cm
127-
128125
from sage.misc.cachefunc import cached_method
129-
130126
from sage.misc.misc_c import prod
131127
from sage.rings.generic import ProductTree, prod_with_derivative
132-
133-
from sage.structure.richcmp import op_EQ
134-
135128
from sage.rings.integer import Integer
129+
from sage.structure.all import coercion_model as cm
130+
from sage.structure.richcmp import op_EQ
131+
from sage.structure.sequence import Sequence
136132

137-
from sage.schemes.elliptic_curves.constructor import EllipticCurve
138-
from sage.schemes.elliptic_curves.ell_finite_field import EllipticCurve_finite_field
139-
from sage.schemes.elliptic_curves.hom import EllipticCurveHom, compare_via_evaluation
133+
from .constructor import EllipticCurve
134+
from .ell_finite_field import EllipticCurve_finite_field
135+
from .hom import EllipticCurveHom, compare_via_evaluation
140136

141137

142138
def _choose_IJK(n):
@@ -1214,11 +1210,11 @@ def _random_example_for_testing():
12141210
True
12151211
"""
12161212
from sage.rings.fast_arith import prime_range
1217-
from sage.misc.prandom import choice
1218-
from sage.misc.prandom import randrange
1213+
from sage.misc.prandom import choice, randrange
12191214
from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
12201215
from sage.arith.functions import lcm
12211216
from sage.rings.finite_rings.integer_mod import Mod
1217+
12221218
while True:
12231219
p = choice(prime_range(2, 100))
12241220
e = randrange(1,5)

‎src/sage/schemes/elliptic_curves/mod_sym_num.pyx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,18 +164,16 @@ AUTHORS:
164164
from cysignals.memory cimport sig_malloc, sig_free, sig_realloc
165165
from cysignals.signals cimport sig_check
166166

167+
from sage.arith.misc import euler_phi, kronecker as kronecker_symbol
167168
from sage.misc.cachefunc import cached_method
168-
169+
from sage.misc.misc_c import prod
170+
from sage.misc.verbose import verbose
169171
from sage.rings.complex_mpfr cimport ComplexNumber
170172
from sage.rings.complex_mpfr import ComplexField
171-
from sage.rings.real_mpfr cimport RealNumber, RealField
172-
from sage.rings.rational cimport Rational
173173
from sage.rings.integer cimport Integer
174+
from sage.rings.rational cimport Rational
175+
from sage.rings.real_mpfr cimport RealNumber, RealField
174176

175-
from sage.misc.misc_c import prod
176-
from sage.misc.verbose import verbose
177-
from sage.arith.misc import kronecker as kronecker_symbol
178-
from sage.arith.misc import euler_phi
179177

180178
cdef extern from "<math.h>":
181179
double log(double)

‎src/sage/schemes/elliptic_curves/padic_lseries.py

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -61,35 +61,33 @@
6161
# https://www.gnu.org/licenses/
6262
######################################################################
6363

64-
from sage.rings.integer_ring import ZZ
65-
from sage.rings.rational_field import QQ
66-
from sage.rings.padics.factory import Qp
67-
from sage.rings.infinity import infinity
68-
from sage.rings.laurent_series_ring import LaurentSeriesRing
69-
from sage.rings.power_series_ring import PowerSeriesRing
70-
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
71-
from sage.rings.finite_rings.integer_mod_ring import IntegerModRing as Integers
72-
73-
from sage.rings.integer import Integer
74-
from sage.arith.misc import valuation
75-
from sage.arith.misc import binomial
76-
from sage.arith.misc import kronecker as kronecker_symbol
77-
from sage.arith.misc import GCD as gcd
78-
from sage.arith.misc import prime_divisors
79-
from sage.arith.functions import lcm as LCM
80-
81-
from sage.structure.sage_object import SageObject
82-
from sage.structure.richcmp import richcmp_method, richcmp
83-
84-
from sage.misc.functional import denominator
85-
from sage.misc.verbose import verbose, get_verbose
86-
87-
from sage.modules.free_module_element import vector
8864
import sage.matrix.all as matrix
8965
import sage.schemes.hyperelliptic_curves.monsky_washnitzer
66+
67+
from sage.arith.functions import lcm as LCM
68+
from sage.arith.misc import (binomial,
69+
GCD as gcd,
70+
prime_divisors,
71+
kronecker as kronecker_symbol,
72+
valuation)
9073
from sage.functions.log import log
9174
from sage.functions.other import floor
9275
from sage.misc.cachefunc import cached_method
76+
from sage.misc.functional import denominator
77+
from sage.misc.verbose import get_verbose, verbose
78+
from sage.modules.free_module_element import vector
79+
from sage.rings.finite_rings.integer_mod_ring import IntegerModRing as Integers
80+
from sage.rings.infinity import infinity
81+
from sage.rings.integer import Integer
82+
from sage.rings.integer_ring import ZZ
83+
from sage.rings.laurent_series_ring import LaurentSeriesRing
84+
from sage.rings.padics.factory import Qp
85+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
86+
from sage.rings.power_series_ring import PowerSeriesRing
87+
from sage.rings.rational_field import QQ
88+
from sage.structure.richcmp import richcmp_method, richcmp
89+
from sage.structure.sage_object import SageObject
90+
9391

9492
@richcmp_method
9593
class pAdicLseries(SageObject):

‎src/sage/schemes/elliptic_curves/padics.py

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,28 @@
2121
# https://www.gnu.org/licenses/
2222
######################################################################
2323

24+
import math
2425

25-
import sage.rings.all as rings
26-
from . import padic_lseries as plseries
2726
import sage.arith.all as arith
28-
from sage.rings.padics.factory import Qp
29-
from sage.rings.padics.factory import Zp
27+
import sage.matrix.all as matrix
28+
import sage.misc.misc as misc
29+
import sage.rings.all as rings
30+
import sage.schemes.hyperelliptic_curves.hypellfrob
31+
import sage.schemes.hyperelliptic_curves.monsky_washnitzer
32+
33+
from sage.misc.cachefunc import cached_method
34+
from sage.rings.big_oh import O
3035
from sage.rings.finite_rings.integer_mod_ring import IntegerModRing as Integers
3136
from sage.rings.integer import Integer
32-
from sage.rings.big_oh import O
33-
from sage.rings.power_series_ring import PowerSeriesRing
3437
from sage.rings.laurent_series_ring import LaurentSeriesRing
38+
from sage.rings.padics.factory import Qp, Zp
39+
from sage.rings.power_series_ring import PowerSeriesRing
3540
from sage.rings.rational_field import RationalField
36-
import math
37-
import sage.misc.misc as misc
38-
import sage.matrix.all as matrix
41+
42+
from . import padic_lseries as plseries
43+
3944
sqrt = math.sqrt
40-
import sage.schemes.hyperelliptic_curves.monsky_washnitzer
41-
import sage.schemes.hyperelliptic_curves.hypellfrob
42-
from sage.misc.cachefunc import cached_method
45+
4346

4447
def __check_padic_hypotheses(self, p):
4548
r"""

‎src/sage/schemes/elliptic_curves/period_lattice.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,22 +96,22 @@
9696
9797
"""
9898

99+
import sage.rings.abc
100+
101+
from sage.libs.pari.all import pari
102+
from sage.misc.cachefunc import cached_method
99103
from sage.modules.free_module import FreeModule_generic_pid
104+
from sage.rings.complex_mpfr import ComplexField
105+
from sage.rings.complex_mpfr import ComplexNumber
106+
from sage.rings.infinity import Infinity
100107
from sage.rings.integer_ring import ZZ
108+
from sage.rings.number_field.number_field import refine_embedding
109+
from sage.rings.qqbar import AA, QQbar
101110
from sage.rings.rational_field import QQ
102111
from sage.rings.real_mpfr import RealField
103-
from sage.rings.complex_mpfr import ComplexField
104-
from sage.rings.qqbar import QQbar
105-
from sage.rings.qqbar import AA
106-
import sage.rings.abc
107-
from sage.rings.complex_mpfr import ComplexNumber
108112
from sage.rings.real_mpfr import RealNumber as RealNumber
109-
from sage.rings.number_field.number_field import refine_embedding
110-
from sage.rings.infinity import Infinity
111113
from sage.schemes.elliptic_curves.constructor import EllipticCurve
112-
from sage.misc.cachefunc import cached_method
113114
from sage.structure.richcmp import richcmp_method, richcmp, richcmp_not_equal
114-
from sage.libs.pari.all import pari
115115

116116

117117
class PeriodLattice(FreeModule_generic_pid):

0 commit comments

Comments
 (0)