Fix up imports

src/sage/interfaces/fricas.py

@@ -1927,7 +1927,9 @@ def _sage_(self):
             <BLANKLINE>
                Cannot convert the value from type Any to InputForm .
         """
-        from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, RDF, I
+        from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+        from sage.rings.real_double import RDF
+        from sage.rings.imaginary_unit import I
         from sage.rings.real_mpfr import RealField
         from sage.symbolic.ring import SR
         from sage.matrix.constructor import matrix

src/sage/interfaces/lie.py

@@ -811,7 +811,8 @@ def _sage_(self):
             data = sage_eval(str(self).replace('\n', '').strip())
             return sage.matrix.constructor.matrix(data)
         elif t == 'pol':
-            from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, QQ
+            from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+            from sage.rings.rational_field import QQ
 
             # Figure out the number of variables
             s = str(self)

src/sage/modular/modform_hecketriangle/constructor.py

@@ -19,7 +19,8 @@
 from sage.rings.integer_ring import ZZ
 from sage.rings.rational_field import QQ
 from sage.rings.infinity import infinity
-from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, FractionField
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+from sage.rings.fraction_field import FractionField
 
 
 def rational_type(f, n=ZZ(3), base_ring=ZZ):

src/sage/schemes/cyclic_covers/cycliccover_finite_field.py

@@ -70,7 +70,8 @@
 from sage.arith.misc import euler_phi
 from sage.functions.other import ceil, binomial, floor
 from sage.functions.log import log
-from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, PowerSeriesRing
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+from sage.rings.power_series_ring import PowerSeriesRing
 from sage.rings.padics.factory import Zp, Zq, Qq
 from sage.rings.integer_ring import ZZ
 from sage.rings.finite_rings.integer_mod_ring import IntegerModRing

src/sage/schemes/elliptic_curves/ell_curve_isogeny.py

@@ -67,7 +67,9 @@
 
 from sage.schemes.elliptic_curves.hom import EllipticCurveHom
 
-from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, Integer, LaurentSeriesRing
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+from sage.rings.integer import Integer
+from sage.rings.laurent_series_ring import LaurentSeriesRing
 from sage.rings.polynomial.polynomial_element import is_Polynomial
 from sage.schemes.elliptic_curves.all import EllipticCurve
 from sage.schemes.elliptic_curves.ell_generic import is_EllipticCurve

src/sage/schemes/elliptic_curves/ell_local_data.py

@@ -89,7 +89,10 @@
 from sage.structure.sage_object import SageObject
 from sage.misc.verbose import verbose
 
-from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, QQ, ZZ, Integer
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+from sage.rings.rational_field import QQ
+from sage.rings.integer_ring import ZZ
+from sage.rings.integer import Integer
 from sage.rings.number_field.number_field_ideal import is_NumberFieldFractionalIdeal
 
 from sage.rings.number_field.number_field import is_NumberField

src/sage/schemes/elliptic_curves/ell_number_field.py

@@ -90,7 +90,11 @@
 from .ell_generic import is_EllipticCurve
 from .ell_point import EllipticCurvePoint_number_field
 from .constructor import EllipticCurve
-from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, ZZ, QQ, RealField, Integer
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.real_mpfr import RealField
+from sage.rings.integer import Integer
 from sage.misc.cachefunc import cached_method
 from sage.misc.misc_c import prod
 

src/sage/schemes/elliptic_curves/mod5family.py

@@ -15,7 +15,8 @@
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
-from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, QQ
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+from sage.rings.rational_field import QQ
 from .constructor import EllipticCurve
 
 

src/sage/schemes/hyperelliptic_curves/jacobian_homset.py

@@ -46,8 +46,9 @@
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
-from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, Integer, ZZ
-from sage.rings.integer import is_Integer
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+from sage.rings.integer_ring import ZZ
+from sage.rings.integer import is_Integer, Integer
 from sage.rings.polynomial.polynomial_element import is_Polynomial
 
 from sage.schemes.generic.homset import SchemeHomset_points

src/sage/schemes/toric/variety.py

@@ -325,7 +325,9 @@
 from sage.misc.all import latex, prod, cached_method
 from sage.structure.unique_representation import UniqueRepresentation
 from sage.modules.free_module_element import vector
-from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, ZZ, QQ
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
 from sage.rings.quotient_ring_element import QuotientRingElement
 from sage.rings.quotient_ring import QuotientRing_generic
 from sage.schemes.affine.affine_space import AffineSpace