diff --git a/src/sage/rings/number_field/number_field.py b/src/sage/rings/number_field/number_field.py index 561c575b0a6..1de13904dc7 100644 --- a/src/sage/rings/number_field/number_field.py +++ b/src/sage/rings/number_field/number_field.py @@ -5100,7 +5100,7 @@ def selmer_group_iterator(self, S, m, proof=True): """ KSgens, ords = self.selmer_generators(S=S, m=m, proof=proof, orders=True) one = self.one() - from sage.misc.all import cartesian_product_iterator + from sage.misc.mrange import cartesian_product_iterator for ev in cartesian_product_iterator([range(o) for o in ords]): yield prod([p ** e for p, e in zip(KSgens, ev)], one) diff --git a/src/sage/schemes/affine/affine_rational_point.py b/src/sage/schemes/affine/affine_rational_point.py index 513b5d67aa0..73a4c7d0ba6 100644 --- a/src/sage/schemes/affine/affine_rational_point.py +++ b/src/sage/schemes/affine/affine_rational_point.py @@ -53,7 +53,7 @@ from sage.rings.integer_ring import ZZ from sage.rings.rational_field import QQ -from sage.misc.all import cartesian_product_iterator +from sage.misc.mrange import cartesian_product_iterator from sage.schemes.generic.scheme import is_Scheme diff --git a/src/sage/schemes/affine/affine_space.py b/src/sage/schemes/affine/affine_space.py index b2505942726..f0654de0eb9 100644 --- a/src/sage/schemes/affine/affine_space.py +++ b/src/sage/schemes/affine/affine_space.py @@ -21,7 +21,7 @@ _Fields = Fields() from sage.categories.number_fields import NumberFields from sage.misc.latex import latex -from sage.misc.all import cartesian_product_iterator +from sage.misc.mrange import cartesian_product_iterator from sage.structure.category_object import normalize_names from sage.schemes.generic.scheme import AffineScheme from sage.schemes.generic.ambient_space import AmbientSpace diff --git a/src/sage/schemes/elliptic_curves/ell_rational_field.py b/src/sage/schemes/elliptic_curves/ell_rational_field.py index b0b674a0bde..221b4262344 100644 --- a/src/sage/schemes/elliptic_curves/ell_rational_field.py +++ b/src/sage/schemes/elliptic_curves/ell_rational_field.py @@ -6579,7 +6579,7 @@ def S_integral_x_coords_with_abs_bounded_by(abs_bound): return set(xs) #<------------------------------------------------------------------------- #End internal functions ############################################### - from sage.misc.all import cartesian_product_iterator + from sage.misc.mrange import cartesian_product_iterator E = self tors_points = E.torsion_points() diff --git a/src/sage/schemes/elliptic_curves/height.py b/src/sage/schemes/elliptic_curves/height.py index de9cbc670de..a4cdd111a95 100644 --- a/src/sage/schemes/elliptic_curves/height.py +++ b/src/sage/schemes/elliptic_curves/height.py @@ -36,7 +36,7 @@ from sage.rings.all import RR, RDF, RIF, CC, CDF, CIF from sage.misc.cachefunc import cached_method -from sage.misc.all import cartesian_product_iterator +from sage.misc.mrange import cartesian_product_iterator from sage.arith.all import lcm, factorial from sage.ext.fast_callable import fast_callable from sage.functions.log import log, exp diff --git a/src/sage/schemes/projective/projective_rational_point.py b/src/sage/schemes/projective/projective_rational_point.py index f050d3764cb..bc0b33e8dfb 100644 --- a/src/sage/schemes/projective/projective_rational_point.py +++ b/src/sage/schemes/projective/projective_rational_point.py @@ -59,7 +59,7 @@ from sage.arith.all import gcd, srange, next_prime, previous_prime, crt from sage.rings.all import ZZ, RR from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF -from sage.misc.all import cartesian_product_iterator +from sage.misc.mrange import cartesian_product_iterator from sage.misc.misc_c import prod from sage.misc.mrange import xmrange from sage.schemes.generic.scheme import is_Scheme diff --git a/src/sage/schemes/projective/projective_space.py b/src/sage/schemes/projective/projective_space.py index 78ef9e560bf..2da42665500 100644 --- a/src/sage/schemes/projective/projective_space.py +++ b/src/sage/schemes/projective/projective_space.py @@ -96,7 +96,7 @@ from sage.categories.map import Map from sage.misc.latex import latex from sage.misc.misc_c import prod -from sage.misc.all import cartesian_product_iterator +from sage.misc.mrange import cartesian_product_iterator from sage.misc.persist import register_unpickle_override from sage.structure.category_object import normalize_names diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py index e07e50feea1..4801c05856e 100644 --- a/src/sage/symbolic/relation.py +++ b/src/sage/symbolic/relation.py @@ -1570,7 +1570,7 @@ def solve_mod(eqns, modulus, solution_dict=False): """ from sage.rings.all import Integer, Integers, crt_basis from sage.structure.element import Expression - from sage.misc.all import cartesian_product_iterator + from sage.misc.mrange import cartesian_product_iterator from sage.modules.free_module_element import vector from sage.matrix.constructor import matrix @@ -1686,7 +1686,7 @@ def _solve_mod_prime_power(eqns, p, m, vars): """ from sage.rings.all import Integers, PolynomialRing from sage.modules.free_module_element import vector - from sage.misc.all import cartesian_product_iterator + from sage.misc.mrange import cartesian_product_iterator mrunning = 1 ans = []