Skip to content

Commit 0847642

Browse files
author
Release Manager
committed
gh-35033: sage.schemes: Replace imports from sage.*.all for namespace packages <!-- ^^^^^ 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" --> ### 📚 Description <!-- Describe your changes here in detail --> <!-- Why is this change required? What problem does it solve? --> <!-- If it resolves an open issue, please link to the issue here. For example "Closes #1337" --> Closes #34951 ### 📝 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! --> - [x] I have made sure that the title is self-explanatory and the description concisely explains the PR. - [x] I have linked an issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open pull requests that this PR logically depends on --> <!-- - #xyz: short description why this is a dependency - #abc: ... --> URL: #35033 Reported by: Matthias Köppe Reviewer(s): Lorenz Panny
2 parents b6557a8 + f53eb61 commit 0847642

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+247
-169
lines changed

src/sage/schemes/affine/affine_morphism.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
from sage.misc.cachefunc import cached_method
6060
from sage.misc.lazy_attribute import lazy_attribute
6161

62-
from sage.arith.all import gcd
62+
from sage.arith.misc import GCD as gcd
6363

6464
from sage.rings.integer import Integer
6565
from sage.rings.finite_rings.finite_field_constructor import is_PrimeFiniteField

src/sage/schemes/elliptic_curves/BSD.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"Birch and Swinnerton-Dyer formulas"
33

44
from sage.arith.misc import prime_divisors
5-
from sage.rings.all import ZZ, Infinity, QuadraticField
5+
from sage.rings.integer_ring import ZZ
6+
from sage.rings.infinity import Infinity
7+
from sage.rings.number_field.number_field import QuadraticField
68
from sage.functions.other import ceil
79

810

@@ -480,7 +482,7 @@ def prove_BSD(E, verbosity=0, two_desc='mwrank', proof=None, secs_hi=5,
480482
# We do not know BSD(E,p) for even a single p, since it's
481483
# an open problem to show that L^r(E,1)/(Reg*Omega) is
482484
# rational for any curve with r >= 2.
483-
from sage.sets.all import Primes
485+
from sage.sets.primes import Primes
484486
BSD.primes = Primes()
485487
if return_BSD:
486488
BSD.rank = rank_lower_bd

src/sage/schemes/elliptic_curves/cardinality.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
# ****************************************************************************
2222
from .constructor import EllipticCurve, EllipticCurve_from_j
2323
from sage.schemes.curves.projective_curve import Hasse_bounds
24-
from sage.rings.all import Integer, ZZ, GF, polygen
24+
from sage.rings.integer import Integer
25+
from sage.rings.integer_ring import ZZ
26+
from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
27+
from sage.rings.polynomial.polynomial_ring import polygen
2528
from sage.groups.generic import order_from_bounds
2629

2730

src/sage/schemes/elliptic_curves/cm.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
# ****************************************************************************
3535

3636
from sage.interfaces.magma import magma
37-
from sage.rings.all import (Integer,
38-
QQ,
39-
ZZ,
40-
IntegerRing,
41-
is_fundamental_discriminant,
42-
PolynomialRing)
37+
from sage.rings.integer import Integer
38+
from sage.rings.rational_field import QQ
39+
from sage.rings.integer_ring import ZZ
40+
from sage.rings.integer_ring import IntegerRing
41+
from sage.rings.number_field.number_field import is_fundamental_discriminant
42+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
4343

4444
from sage.misc.cachefunc import cached_function
4545

@@ -124,7 +124,8 @@ def hilbert_class_polynomial(D, algorithm=None):
124124
raise ValueError("%s is not a valid algorithm" % algorithm)
125125

126126
from sage.quadratic_forms.binary_qf import BinaryQF_reduced_representatives
127-
from sage.rings.all import RR, ComplexField
127+
from sage.rings.real_mpfr import RR
128+
from sage.rings.complex_mpfr import ComplexField
128129
from sage.functions.all import elliptic_j
129130

130131
# get all primitive reduced quadratic forms, (necessary to exclude
@@ -623,7 +624,8 @@ def is_cm_j_invariant(j, method='new'):
623624
True
624625
"""
625626
# First we check that j is an algebraic number:
626-
from sage.rings.all import NumberFieldElement, NumberField
627+
from sage.rings.number_field.number_field_element import NumberFieldElement
628+
from sage.rings.number_field.number_field import NumberField
627629
if not isinstance(j, NumberFieldElement) and j not in QQ:
628630
raise NotImplementedError("is_cm_j_invariant() is only implemented for number field elements")
629631

src/sage/schemes/elliptic_curves/descent_two_isogeny.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ from sage.rings.integer_ring import ZZ
1919
from sage.rings.polynomial.polynomial_ring import polygen
2020
cdef object x_ZZ = polygen(ZZ)
2121
from sage.rings.polynomial.real_roots import real_roots
22-
from sage.arith.all import prime_divisors
23-
from sage.all import ntl
22+
from sage.arith.misc import prime_divisors
23+
import sage.libs.ntl.all as ntl
2424

2525
from sage.rings.integer cimport Integer
2626
from sage.libs.gmp.mpz cimport *

src/sage/schemes/elliptic_curves/ell_curve_isogeny.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2486,7 +2486,7 @@ def __compute_omega_general(self, E, psi, psi_pr, phi, phi_pr):
24862486
# thesis are wrong, the correct formulas
24872487
# are coded below
24882488

2489-
from sage.arith.all import binomial
2489+
from sage.arith.misc import binomial
24902490

24912491
for j in range(n - 1):
24922492
psi_prpr += binomial(j+2, 2) * psi[j+2] * cur_x_pow

src/sage/schemes/elliptic_curves/ell_field.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ def isogenies_prime_degree(self, l=None, max_l=31):
14341434
raise NotImplementedError("This code could be implemented for QQbar, but has not been yet.")
14351435

14361436
if l is None:
1437-
from sage.rings.all import prime_range
1437+
from sage.rings.fast_arith import prime_range
14381438
L = prime_range(max_l + 1)
14391439
else:
14401440
try:

src/sage/schemes/elliptic_curves/ell_finite_field.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,24 @@
2525
# https://www.gnu.org/licenses/
2626
# ****************************************************************************
2727

28+
import sage.groups.generic as generic
2829

30+
from sage.arith.functions import lcm
31+
from sage.arith.misc import binomial, GCD as gcd
32+
from sage.groups.additive_abelian.additive_abelian_wrapper import AdditiveAbelianGroupWrapper
33+
from sage.misc.cachefunc import cached_method
34+
from sage.rings.finite_rings.element_base import is_FiniteFieldElement
35+
from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
36+
from sage.rings.integer import Integer
37+
from sage.rings.integer_ring import ZZ
38+
from sage.rings.polynomial.polynomial_ring import polygen
39+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
2940
from sage.schemes.curves.projective_curve import Hasse_bounds
30-
from .ell_field import EllipticCurve_field
31-
from .constructor import EllipticCurve
3241
from sage.schemes.hyperelliptic_curves.hyperelliptic_finite_field import HyperellipticCurve_finite_field
33-
from sage.rings.all import Integer, ZZ, PolynomialRing, GF, polygen
34-
from sage.rings.finite_rings.element_base import is_FiniteFieldElement
35-
import sage.groups.generic as generic
42+
3643
from . import ell_point
37-
from sage.arith.all import gcd, lcm, binomial
38-
from sage.misc.cachefunc import cached_method
39-
from sage.groups.additive_abelian.additive_abelian_wrapper import AdditiveAbelianGroupWrapper
44+
from .constructor import EllipticCurve
45+
from .ell_field import EllipticCurve_field
4046

4147

4248
class EllipticCurve_finite_field(EllipticCurve_field, HyperellipticCurve_finite_field):

src/sage/schemes/elliptic_curves/ell_generic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import sage.groups.additive_abelian.additive_abelian_group as groups
6363
import sage.groups.generic as generic
6464

65-
from sage.arith.all import lcm
65+
from sage.arith.functions import lcm
6666
import sage.rings.all as rings
6767
from sage.misc.cachefunc import cached_method
6868
from sage.misc.fast_methods import WithEqualityById

src/sage/schemes/elliptic_curves/ell_modular_symbols.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +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.all import next_prime, kronecker_symbol, prime_divisors, valuation
95+
from sage.misc.verbose import verbose
96+
from sage.modular.cusps import Cusps
97+
from sage.modular.modsym.all import ModularSymbols
9598
from sage.rings.infinity import unsigned_infinity as infinity
9699
from sage.rings.integer import Integer
97-
from sage.modular.cusps import Cusps
98100
from sage.rings.integer_ring import ZZ
99101
from sage.rings.rational_field import QQ
100-
from sage.misc.verbose import verbose
102+
from sage.structure.sage_object import SageObject
103+
104+
from .constructor import EllipticCurve
101105

102-
from sage.schemes.elliptic_curves.constructor import EllipticCurve
103106

104107
oo = Cusps(infinity)
105108
zero = Integer(0)

0 commit comments

Comments
 (0)