diff --git a/src/sage/databases/cremona.py b/src/sage/databases/cremona.py index 8440a4811b1..6353ad7bbfe 100644 --- a/src/sage/databases/cremona.py +++ b/src/sage/databases/cremona.py @@ -51,7 +51,7 @@ import sage.schemes.elliptic_curves.constructor as elliptic from .sql_db import SQLDatabase, verify_column from sage.features.databases import DatabaseCremona -from sage.misc.all import walltime +from sage.misc.misc import walltime import re import string diff --git a/src/sage/interfaces/gnuplot.py b/src/sage/interfaces/gnuplot.py index b57967f433e..1757e616170 100644 --- a/src/sage/interfaces/gnuplot.py +++ b/src/sage/interfaces/gnuplot.py @@ -179,7 +179,7 @@ def plot3d_parametric(self, f='cos(u)*(3 + v*cos(u/2)), sin(u)*(3 + v*cos(u/2)), self(cmd) def interact(self, cmd): - from sage.misc.all import SAGE_TMP + from sage.misc.misc import SAGE_TMP file = os.path.join(SAGE_TMP, 'gnuplot') with open(file, 'w') as f: f.write(cmd + '\n pause -1 "Press return to continue (no further rotation possible)"') diff --git a/src/sage/lfunctions/lcalc.py b/src/sage/lfunctions/lcalc.py index aabbd47636f..939cfbbca72 100644 --- a/src/sage/lfunctions/lcalc.py +++ b/src/sage/lfunctions/lcalc.py @@ -30,7 +30,7 @@ import os from sage.structure.sage_object import SageObject -from sage.misc.all import pager +from sage.misc.pager import pager import sage.rings.all import sage.schemes.elliptic_curves.ell_generic diff --git a/src/sage/lfunctions/sympow.py b/src/sage/lfunctions/sympow.py index 7ba8b19df54..7af1940f62b 100644 --- a/src/sage/lfunctions/sympow.py +++ b/src/sage/lfunctions/sympow.py @@ -49,7 +49,7 @@ import os from sage.structure.sage_object import SageObject -from sage.misc.all import pager +from sage.misc.pager import pager from sage.misc.verbose import verbose import sage.rings.all diff --git a/src/sage/modular/modform/half_integral.py b/src/sage/modular/modform/half_integral.py index 0e945a0c4ef..94587840566 100644 --- a/src/sage/modular/modform/half_integral.py +++ b/src/sage/modular/modform/half_integral.py @@ -128,7 +128,7 @@ def half_integral_weight_modform_basis(chi, k, prec): B = C.basis() # This computation of S below -- of course --dominates the whole function. - #from sage.misc.all import cputime + #from sage.misc.misc import cputime #tm = cputime() #print "Computing basis..." S = [f.q_expansion(prec) for f in B] diff --git a/src/sage/numerical/backends/glpk_backend.pyx b/src/sage/numerical/backends/glpk_backend.pyx index 3a60b981b43..d93d90e97c8 100644 --- a/src/sage/numerical/backends/glpk_backend.pyx +++ b/src/sage/numerical/backends/glpk_backend.pyx @@ -2497,7 +2497,7 @@ cdef class GLPKBackend(GenericBackend): End of report """ - from sage.misc.all import SAGE_TMP + from sage.misc.misc import SAGE_TMP if filename is None: fname = SAGE_TMP + "/ranges.tmp" diff --git a/src/sage/rings/padics/relaxed_template.pxi b/src/sage/rings/padics/relaxed_template.pxi index 6c155e1c8a3..d9425c88682 100644 --- a/src/sage/rings/padics/relaxed_template.pxi +++ b/src/sage/rings/padics/relaxed_template.pxi @@ -2001,7 +2001,7 @@ cdef class RelaxedElement(pAdicGenericElement): :func:`dumps`, :func:`loads` """ tester = self._tester(**options) - from sage.misc.all import loads, dumps + from sage.misc.persist import loads, dumps if self._precbound >= maxordp: tester.assertEqual(loads(dumps(self)), self.at_precision_relative()) else: diff --git a/src/sage/sandpiles/sandpile.py b/src/sage/sandpiles/sandpile.py index f29d7395d7f..3776fc999b3 100644 --- a/src/sage/sandpiles/sandpile.py +++ b/src/sage/sandpiles/sandpile.py @@ -336,12 +336,19 @@ from sage.topology.simplicial_complex import SimplicialComplex from sage.interfaces.singular import singular from sage.matrix.constructor import matrix, identity_matrix -from sage.misc.all import prod, det, tmp_filename, exists, denominator +from sage.misc.functional import det, denominator +from sage.misc.misc import exists +from sage.misc.misc_c import prod +from sage.misc.temporary_file import tmp_filename from sage.arith.srange import xsrange from sage.modules.free_module_element import vector from sage.plot.colors import rainbow -from sage.arith.all import falling_factorial, lcm -from sage.rings.all import Integer, PolynomialRing, QQ, ZZ +from sage.arith.functions import lcm +from sage.arith.misc import falling_factorial +from sage.rings.integer import Integer +from sage.rings.integer_ring import ZZ +from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing +from sage.rings.rational_field import QQ from sage.symbolic.constants import I, pi from sage.symbolic.ring import SR from sage.features.four_ti_2 import FourTi2Executable diff --git a/src/sage/schemes/curves/affine_curve.py b/src/sage/schemes/curves/affine_curve.py index 23312f06ed6..a0fdd7e0000 100644 --- a/src/sage/schemes/curves/affine_curve.py +++ b/src/sage/schemes/curves/affine_curve.py @@ -128,7 +128,7 @@ from sage.arith.misc import binomial from sage.interfaces.all import singular -from sage.misc.all import add +from builtins import sum as add from sage.categories.fields import Fields from sage.categories.finite_fields import FiniteFields diff --git a/src/sage/schemes/curves/projective_curve.py b/src/sage/schemes/curves/projective_curve.py index 068ffb73146..79929177759 100644 --- a/src/sage/schemes/curves/projective_curve.py +++ b/src/sage/schemes/curves/projective_curve.py @@ -146,9 +146,11 @@ from sage.interfaces.all import singular from sage.matrix.constructor import matrix -from sage.misc.all import add, sage_eval +from builtins import sum as add +from sage.misc.sage_eval import sage_eval -from sage.rings.all import degree_lowest_rational_function, IntegerRing +from sage.rings.all import degree_lowest_rational_function +from sage.rings.integer_ring import IntegerRing from sage.rings.number_field.number_field import NumberField from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing from sage.rings.qqbar import (number_field_elements_from_algebraics, diff --git a/src/sage/schemes/elliptic_curves/ell_curve_isogeny.py b/src/sage/schemes/elliptic_curves/ell_curve_isogeny.py index 9783877f153..da10953408d 100644 --- a/src/sage/schemes/elliptic_curves/ell_curve_isogeny.py +++ b/src/sage/schemes/elliptic_curves/ell_curve_isogeny.py @@ -1860,7 +1860,7 @@ def __init_from_kernel_list(self, kernel_gens): # but it won't speed things up too much. kernel_set = Set([self.__E1(0)]) - from sage.misc.all import flatten + from sage.misc.flatten import flatten def all_multiples(itr, terminal): mult_list = [terminal] diff --git a/src/sage/schemes/elliptic_curves/ell_egros.py b/src/sage/schemes/elliptic_curves/ell_egros.py index bc782475f2e..d487235ab35 100644 --- a/src/sage/schemes/elliptic_curves/ell_egros.py +++ b/src/sage/schemes/elliptic_curves/ell_egros.py @@ -89,7 +89,7 @@ # https://www.gnu.org/licenses/ # **************************************************************************** -from sage.misc.all import xmrange +from sage.misc.mrange import xmrange from sage.rings.rational_field import QQ from .constructor import EllipticCurve, EllipticCurve_from_j diff --git a/src/sage/schemes/elliptic_curves/isogeny_class.py b/src/sage/schemes/elliptic_curves/isogeny_class.py index 440792d5615..f137e39eb6c 100644 --- a/src/sage/schemes/elliptic_curves/isogeny_class.py +++ b/src/sage/schemes/elliptic_curves/isogeny_class.py @@ -30,7 +30,8 @@ import sage.databases.cremona from sage.rings.integer_ring import ZZ from sage.rings.rational_field import QQ -from sage.misc.all import flatten, cached_method +from sage.misc.flatten import flatten +from sage.misc.cachefunc import cached_method from sage.schemes.elliptic_curves.ell_field import EllipticCurve_field from sage.schemes.elliptic_curves.ell_number_field import EllipticCurve_number_field diff --git a/src/sage/schemes/elliptic_curves/padic_lseries.py b/src/sage/schemes/elliptic_curves/padic_lseries.py index d462d6c7151..4ee2bddbb17 100644 --- a/src/sage/schemes/elliptic_curves/padic_lseries.py +++ b/src/sage/schemes/elliptic_curves/padic_lseries.py @@ -68,14 +68,13 @@ from sage.rings.all import LaurentSeriesRing, PowerSeriesRing, PolynomialRing, Integers from sage.rings.integer import Integer -from sage.arith.all import valuation, binomial, kronecker_symbol, gcd, prime_divisors +from sage.arith.all import valuation, binomial, kronecker_symbol, gcd, prime_divisors, LCM from sage.structure.sage_object import SageObject from sage.structure.richcmp import richcmp_method, richcmp -from sage.misc.all import denominator +from sage.misc.functional import denominator from sage.misc.verbose import verbose, get_verbose -import sage.arith.all as arith from sage.modules.free_module_element import vector import sage.matrix.all as matrix @@ -1671,8 +1670,8 @@ def Dp_valued_height(self,prec=20): elog = Ehat.log(prec + Integer(3)) # we will have to do it properly with David Harvey's _multiply_point() - n = arith.LCM(E.tamagawa_numbers()) - n = arith.LCM(n, E.Np(p)) # allowed here because E has good reduction at p + n = LCM(E.tamagawa_numbers()) + n = LCM(n, E.Np(p)) # allowed here because E has good reduction at p def height(P,check=True): if P.is_finite_order(): diff --git a/src/sage/schemes/toric/chow_group.py b/src/sage/schemes/toric/chow_group.py index ea00dd42dd8..dde1ac5f600 100644 --- a/src/sage/schemes/toric/chow_group.py +++ b/src/sage/schemes/toric/chow_group.py @@ -119,14 +119,16 @@ # **************************************************************************** from __future__ import annotations -from sage.misc.all import flatten +from sage.misc.flatten import flatten from sage.misc.fast_methods import WithEqualityById from sage.modules.fg_pid.fgp_module import FGP_Module_class from sage.modules.fg_pid.fgp_element import FGP_Element from sage.modules.free_module import FreeModule from sage.structure.sage_object import SageObject from sage.structure.factory import UniqueFactory -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 import sage.geometry.abc from sage.schemes.toric.variety import is_ToricVariety diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx index 843cfee7f4c..cb9a2e755e2 100644 --- a/src/sage/symbolic/expression.pyx +++ b/src/sage/symbolic/expression.pyx @@ -1467,7 +1467,7 @@ cdef class Expression(Expression_abc): MATHML version of the string pi + 2 """ - from sage.misc.all import mathml + from sage.misc.mathml import mathml try: obj = self.pyobject() except TypeError: