Merge sagemath#32734

Author: mkoeppe

src/sage/combinat/cluster_algebra_quiver/cluster_seed.py

@@ -37,9 +37,11 @@
 from itertools import islice
 from sage.structure.sage_object import SageObject
 from copy import copy
-from sage.rings.all import QQ, infinity
+from sage.rings.rational_field import QQ
+from sage.rings.infinity import infinity
 from sage.rings.integer_ring import ZZ
-from sage.rings.all import FractionField, PolynomialRing
+from sage.rings.fraction_field import FractionField
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
 from sage.rings.fraction_field_element import FractionFieldElement
 from sage.sets.all import Set
 from sage.graphs.digraph import DiGraph

src/sage/combinat/cluster_algebra_quiver/mutation_class.py

@@ -20,7 +20,8 @@
 
 import time
 from sage.groups.perm_gps.partn_ref.refinement_graphs import search_tree, get_orbits
-from sage.rings.all import ZZ, infinity
+from sage.rings.integer_ring import ZZ
+from sage.rings.infinity import infinity
 from sage.graphs.all import DiGraph
 from sage.combinat.cluster_algebra_quiver.quiver_mutation_type import _edge_list_to_matrix
 

src/sage/combinat/cluster_algebra_quiver/quiver.py

@@ -39,7 +39,9 @@
 
 from sage.structure.sage_object import SageObject
 from copy import copy
-from sage.rings.all import ZZ, CC, infinity
+from sage.rings.integer_ring import ZZ
+from sage.rings.all import CC
+from sage.rings.infinity import infinity
 from sage.graphs.all import Graph, DiGraph
 from sage.graphs.views import EdgesView
 from sage.arith.misc import gcd

src/sage/combinat/cluster_algebra_quiver/quiver_mutation_type.py

@@ -22,11 +22,12 @@
 from sage.structure.sage_object import SageObject
 from copy import copy
 from sage.structure.unique_representation import UniqueRepresentation
-from sage.misc.all import cached_method
-from sage.rings.all import ZZ, infinity
+from sage.misc.cachefunc import cached_method
+from sage.rings.integer_ring import ZZ
+from sage.rings.infinity import infinity
 from sage.graphs.all import Graph, DiGraph
 from sage.arith.all import binomial, euler_phi
-from sage.all import prod
+from sage.misc.misc_c import prod
 from sage.matrix.constructor import matrix
 
 

src/sage/combinat/combinat.py

@@ -151,7 +151,10 @@
 from __future__ import annotations
 from typing import Iterator
 
-from sage.rings.all import ZZ, QQ, Integer, infinity
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.integer import Integer
+from sage.rings.infinity import infinity
 from sage.arith.all import bernoulli, factorial
 from sage.rings.polynomial.polynomial_element import Polynomial
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing

src/sage/combinat/sf/elementary.py

@@ -21,7 +21,7 @@
 from sage.combinat.partition import Partition
 from sage.misc.misc_c import prod
 from sage.arith.all import factorial, binomial
-from sage.rings.all import infinity
+from sage.rings.infinity import infinity
 
 ###################################
 #                                 #

src/sage/combinat/sf/homogeneous.py

@@ -27,7 +27,7 @@
 ####################################
 from . import multiplicative, classical
 from sage.combinat.partition import Partition
-from sage.rings.all import infinity
+from sage.rings.infinity import infinity
 from sage.misc.misc_c import prod
 from sage.arith.all import factorial, binomial
 

src/sage/combinat/sf/powersum.py

@@ -20,7 +20,7 @@
 from . import sfa, multiplicative, classical
 from sage.combinat.partition import Partition
 from sage.arith.all import divisors
-from sage.rings.all import infinity
+from sage.rings.infinity import infinity
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
 from sage.misc.misc_c import prod
 

src/sage/combinat/sf/sfa.py

@@ -212,7 +212,11 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 from sage.misc.cachefunc import cached_method
-from sage.rings.all import Integer, PolynomialRing, QQ, ZZ, infinity
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.integer import Integer
+from sage.rings.infinity import infinity
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
 from sage.rings.polynomial.polynomial_element import is_Polynomial
 from sage.rings.polynomial.multi_polynomial import is_MPolynomial
 from sage.combinat.partition import _Partitions, Partitions, Partitions_n, Partition

src/sage/modular/abvar/lseries.py

@@ -22,7 +22,11 @@
 ###########################################################################
 
 from sage.structure.sage_object import SageObject
-from sage.rings.all import Integer, infinity, ZZ, QQ, CC
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.integer import Integer
+from sage.rings.infinity import infinity
+from sage.rings.all import CC
 from sage.modules.free_module import span
 from sage.misc.misc_c import prod
 

src/sage/modular/modform_hecketriangle/abstract_ring.py

@@ -16,7 +16,10 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.rings.all import FractionField, PolynomialRing, PowerSeriesRing, ZZ, QQ, infinity
+from sage.rings.infinity import infinity
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.all import FractionField, PolynomialRing, PowerSeriesRing
 from sage.algebras.free_algebra import FreeAlgebra
 
 from sage.structure.parent import Parent

src/sage/modular/modform_hecketriangle/abstract_space.py

@@ -16,14 +16,17 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.rings.all import ZZ, QQ, infinity, AlgebraicField, I
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.infinity import infinity
+from sage.rings.all import AlgebraicField, I
 from sage.rings.polynomial.polynomial_ring import is_PolynomialRing
 from sage.rings.power_series_ring import is_PowerSeriesRing
 from sage.rings.laurent_series_ring import is_LaurentSeriesRing
 from sage.modules.free_module_element import is_FreeModuleElement
 from sage.matrix.constructor import matrix
 from sage.modules.free_module_element import vector
-from sage.rings.all import Integer
+from sage.rings.integer import Integer
 from sage.structure.all import parent
 
 from sage.misc.cachefunc import cached_method

src/sage/modular/modform_hecketriangle/constructor.py

@@ -16,7 +16,10 @@
 #                  https://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.rings.all import ZZ, QQ, infinity, PolynomialRing, FractionField
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.infinity import infinity
+from sage.rings.all import PolynomialRing, FractionField
 
 
 def rational_type(f, n=ZZ(3), base_ring=ZZ):

src/sage/modular/modform_hecketriangle/functors.py

@@ -16,7 +16,9 @@
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
-from sage.rings.all import ZZ, QQ, infinity
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.infinity import infinity
 
 from sage.categories.functor                     import Functor
 from sage.categories.pushout                     import ConstructionFunctor

src/sage/modular/modform_hecketriangle/graded_ring.py

@@ -16,7 +16,8 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.rings.all import ZZ, infinity
+from sage.rings.integer_ring import ZZ
+from sage.rings.infinity import infinity
 
 from sage.rings.ring import CommutativeAlgebra
 from sage.categories.all import CommutativeAlgebras

src/sage/modular/modform_hecketriangle/graded_ring_element.py

@@ -16,7 +16,9 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.rings.all import ZZ, infinity, LaurentSeries, O
+from sage.rings.integer_ring import ZZ
+from sage.rings.infinity import infinity
+from sage.rings.all import LaurentSeries, O
 from sage.functions.all import exp
 from sage.rings.number_field.number_field import QuadraticField
 from sage.symbolic.all import pi

src/sage/modular/modform_hecketriangle/hecke_triangle_group_element.py

@@ -20,7 +20,9 @@
 from sage.misc.misc_c import prod
 from sage.misc.cachefunc import cached_method
 
-from sage.rings.all import AA, QQbar, ZZ, infinity, CC
+from sage.rings.integer_ring import ZZ
+from sage.rings.infinity import infinity
+from sage.rings.all import AA, QQbar, CC
 
 from sage.groups.matrix_gps.group_element import MatrixGroupElement_generic
 from sage.geometry.hyperbolic_space.hyperbolic_interface import HyperbolicPlane

src/sage/modular/modform_hecketriangle/hecke_triangle_groups.py

@@ -16,7 +16,10 @@
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
-from sage.rings.all import ZZ, QQ, AA, AlgebraicField, infinity, I, PolynomialRing, NumberField
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.infinity import infinity
+from sage.rings.all import AA, AlgebraicField, I, PolynomialRing, NumberField
 from sage.functions.all import cos, exp, sec
 from sage.functions.gamma import psi1
 from sage.symbolic.all import pi

src/sage/modular/modform_hecketriangle/series_constructor.py

@@ -20,7 +20,10 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.rings.all import ZZ, QQ, infinity, PowerSeriesRing
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.infinity import infinity
+from sage.rings.all import PowerSeriesRing
 from sage.rings.big_oh import O
 from sage.arith.all import bernoulli, sigma, rising_factorial
 

src/sage/modular/modform_hecketriangle/space.py

@@ -16,7 +16,9 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.rings.all import ZZ, QQ, infinity
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.infinity import infinity
 
 from sage.modules.module import Module
 from sage.modules.free_module import FreeModule

src/sage/modular/modsym/space.py

@@ -31,7 +31,11 @@
 import sage.modular.hecke.all as hecke
 from sage.arith.all import divisors, next_prime
 from sage.rings.fast_arith import prime_range
-from sage.rings.all import PowerSeriesRing, Integer, QQ, ZZ, infinity, Zmod
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.integer import Integer
+from sage.rings.infinity import infinity
+from sage.rings.all import PowerSeriesRing, Zmod
 from sage.rings.number_field.number_field_base import is_NumberField
 from sage.structure.all import Sequence, SageObject
 from sage.structure.richcmp import (richcmp_method, richcmp,

src/sage/rings/finite_rings/integer_mod.pyx

@@ -1892,7 +1892,7 @@ cdef class IntegerMod_abstract(FiniteRingElement):
             r += 1
             power *= p
             if not power.divides(self.__modulus.sageInteger):
-                from sage.rings.all import infinity
+                from sage.rings.infinity import infinity
                 return infinity
         return r
 

src/sage/rings/function_field/function_field_valuation.py

@@ -923,7 +923,7 @@ def simplify(self, f, error=None, force=False):
             # if the caller was sure that we should simplify, then we should try to do the best simplification possible
             error = self(f) if force else self.upper_bound(f)
 
-        from sage.all import infinity
+        from sage.rings.infinity import infinity
         if error is infinity:
             return f
 

src/sage/rings/padics/local_generic.py

@@ -1055,7 +1055,7 @@ def _test_add_bigoh(self, **options):
         tester = self._tester(**options)
         for x in tester.some_elements():
             tester.assertEqual(x.add_bigoh(x.precision_absolute()), x)
-            from sage.rings.all import infinity
+            from sage.rings.infinity import infinity
             tester.assertEqual(x.add_bigoh(infinity), x)
             tester.assertEqual(x.add_bigoh(x.precision_absolute()+1), x)
 
@@ -1276,7 +1276,7 @@ def _matrix_smith_form(self, M, transformation, integral, exact):
             [O(5^10) O(5^10)]
             [O(5^10) O(5^10)]
         """
-        from sage.rings.all import infinity
+        from sage.rings.infinity import infinity
         from .precision_error import PrecisionError
         from copy import copy
         n = M.nrows()

src/sage/rings/padics/local_generic_element.pyx

@@ -997,7 +997,7 @@ cdef class LocalGenericElement(CommutativeRingElement):
         from sage.categories.all import Fields
         if self.parent() in Fields():
             v = self.valuation()
-            from sage.rings.all import infinity
+            from sage.rings.infinity import infinity
             if self.valuation() is not infinity:
                 shift = shift << v
 

src/sage/rings/padics/padic_valuation.py

@@ -48,7 +48,7 @@
 from sage.structure.factory import UniqueFactory
 from sage.misc.cachefunc import cached_method
 
-from sage.rings.all import infinity
+from sage.rings.infinity import infinity
 
 class PadicValuationFactory(UniqueFactory):
     r"""
@@ -1068,7 +1068,7 @@ def simplify(self, x, error=None, force=False):
 
         if error is None:
             error = self(x)
-        from sage.rings.all import infinity
+        from sage.rings.infinity import infinity
         if error is infinity:
             return x
         # we need to scale by the ramification index because p-adics use a
@@ -1245,7 +1245,7 @@ def simplify(self, x, error=None, force=False, size_heuristic_bound=32):
         v = self(x)
         if error is None:
             error = v
-        from sage.rings.all import infinity
+        from sage.rings.infinity import infinity
         if error is infinity:
             return x
         if error < v:
@@ -1326,7 +1326,7 @@ def inverse(self, x, precision):
         if precision <= 0:
             return self.domain().one()
 
-        from sage.rings.all import infinity
+        from sage.rings.infinity import infinity
         if self(x) > 0 or precision is infinity:
             raise ValueError("element has no approximate inverse in this ring")
 

src/sage/rings/polynomial/real_roots.pyx

@@ -134,7 +134,10 @@ from https://wiki.sagemath.org/days4schedule .
 from copy import copy
 import time
 
-from sage.rings.all import ZZ, QQ, RR, AA, RealField, RealIntervalField, RIF, RDF, infinity
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.infinity import infinity
+from sage.rings.all import RR, AA, RealField, RealIntervalField, RIF, RDF
 from sage.arith.all import binomial, factorial
 from sage.misc.randstate import randstate
 from sage.modules.all import vector, FreeModule

src/sage/rings/valuation/augmented_valuation.py

@@ -157,7 +157,8 @@
 from .inductive_valuation import FinalInductiveValuation, NonFinalInductiveValuation, FiniteInductiveValuation, InfiniteInductiveValuation, InductiveValuation
 
 from sage.misc.cachefunc import cached_method
-from sage.rings.all import infinity, QQ
+from sage.rings.infinity import infinity
+from sage.rings.rational_field import QQ
 from sage.structure.factory import UniqueFactory
 
 

src/sage/rings/valuation/developing_valuation.py

@@ -289,7 +289,7 @@ def _call_(self, f):
         """
         f = self.domain().coerce(f)
 
-        from sage.rings.all import infinity
+        from sage.rings.infinity import infinity
         if f.is_zero():
             return infinity
 

src/sage/rings/valuation/gauss_valuation.py

@@ -265,7 +265,8 @@ def valuations(self, f, coefficients=None, call_error=False):
             yield self._base_valuation(f[0])
             return
 
-        from sage.rings.all import infinity, QQ
+        from sage.rings.infinity import infinity
+        from sage.rings.rational_field import QQ
         if f == self.domain().gen():
             yield infinity
             yield QQ(0)
@@ -795,7 +796,7 @@ def lower_bound(self, f):
             1
 
         """
-        from sage.rings.all import infinity
+        from sage.rings.infinity import infinity
         coefficients = f.coefficients(sparse=True)
         coefficients.reverse()
         ret = infinity
@@ -826,7 +827,7 @@ def upper_bound(self, f):
         f = self.domain().coerce(f)  
         coefficients = f.coefficients(sparse=True)
         if not coefficients:
-            from sage.rings.all import infinity
+            from sage.rings.infinity import infinity
             return infinity
         else:
             return self._base_valuation.upper_bound(coefficients[-1])