diff --git a/src/sage/coding/grs_code.py b/src/sage/coding/grs_code.py index 33944b65523..fec1bc2314c 100644 --- a/src/sage/coding/grs_code.py +++ b/src/sage/coding/grs_code.py @@ -66,7 +66,6 @@ from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.other", "binomial") -from sage.misc.lazy_import import lazy_import lazy_import("sage.symbolic.ring", "SR") from .linear_code import AbstractLinearCode diff --git a/src/sage/crypto/lwe.py b/src/sage/crypto/lwe.py index 857b1abf109..662bb37b391 100644 --- a/src/sage/crypto/lwe.py +++ b/src/sage/crypto/lwe.py @@ -93,7 +93,7 @@ from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.log", "log") -lazy_import("sage.functions.other", "floor, ceil") +lazy_import("sage.functions.other", ["floor", "ceil"]) from sage.misc.functional import sqrt, cyclotomic_polynomial, round from sage.misc.randstate import set_random_seed from sage.misc.prandom import randint diff --git a/src/sage/crypto/public_key/blum_goldwasser.py b/src/sage/crypto/public_key/blum_goldwasser.py index 541a068d7c5..33071b07a6a 100644 --- a/src/sage/crypto/public_key/blum_goldwasser.py +++ b/src/sage/crypto/public_key/blum_goldwasser.py @@ -36,7 +36,6 @@ from sage.crypto.util import random_blum_prime from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.log", "log") -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.other", "Function_floor") from sage.monoids.string_monoid import BinaryStrings from sage.arith.all import gcd, power_mod, xgcd diff --git a/src/sage/dynamics/arithmetic_dynamics/endPN_minimal_model.py b/src/sage/dynamics/arithmetic_dynamics/endPN_minimal_model.py index a0136691b0c..36e05edb38e 100644 --- a/src/sage/dynamics/arithmetic_dynamics/endPN_minimal_model.py +++ b/src/sage/dynamics/arithmetic_dynamics/endPN_minimal_model.py @@ -34,7 +34,6 @@ from sage.rings.polynomial.binary_form_reduce import covariant_z0, epsinv from sage.rings.rational_field import QQ from sage.schemes.affine.affine_space import AffineSpace -from sage.misc.lazy_import import lazy_import lazy_import("sage.symbolic.constants", "e") from sage.arith.all import gcd from copy import copy diff --git a/src/sage/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py index 0ec81f224dd..e1bdb76a415 100644 --- a/src/sage/interfaces/maxima_lib.py +++ b/src/sage/interfaces/maxima_lib.py @@ -94,8 +94,7 @@ # https://www.gnu.org/licenses/ # **************************************************************************** -from sage.misc.lazy_import import lazy_import -lazy_import("sage.symbolic.ring", "SR") +from sage.symbolic.ring import SR from sage.libs.ecl import EclObject, ecl_eval @@ -1160,8 +1159,7 @@ def reduce_load_MaximaLib(): import sage.rings.real_double import sage.symbolic.expression import sage.symbolic.integration.integral -from sage.misc.lazy_import import lazy_import -lazy_import("sage.symbolic.operators", "FDerivativeOperator", "add_vararg, mul_vararg") +from sage.symbolic.operators import FDerivativeOperator, add_vararg, mul_vararg car=EclObject("car") cdr=EclObject("cdr") @@ -1631,8 +1629,7 @@ def sr_to_max(expr): return maxima(expr).ecl() # This goes from EclObject to SR -from sage.misc.lazy_import import lazy_import -lazy_import("sage.symbolic.expression", "symbol_table") +from sage.symbolic.expression import symbol_table max_to_pynac_table = symbol_table['maxima'] diff --git a/src/sage/knots/link.py b/src/sage/knots/link.py index 2bca371c6e1..620a7a24dc5 100644 --- a/src/sage/knots/link.py +++ b/src/sage/knots/link.py @@ -62,7 +62,6 @@ lazy_import("sage.symbolic.ring", "SR") from sage.rings.integer import Integer from sage.numerical.mip import MixedIntegerLinearProgram -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.generalized", "sign") from sage.homology.chain_complex import ChainComplex from sage.misc.flatten import flatten diff --git a/src/sage/modular/hypergeometric_motive.py b/src/sage/modular/hypergeometric_motive.py index 8e932beaa95..ca194b3909b 100644 --- a/src/sage/modular/hypergeometric_motive.py +++ b/src/sage/modular/hypergeometric_motive.py @@ -66,9 +66,7 @@ from sage.combinat.integer_vector_weighted import WeightedIntegerVectors from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.generalized", "sgn") -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.log", "log") -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.other", "floor", "ceil") from sage.misc.cachefunc import cached_method from sage.misc.functional import cyclotomic_polynomial diff --git a/src/sage/modules/vector_callable_symbolic_dense.py b/src/sage/modules/vector_callable_symbolic_dense.py index 8e42cdeaafb..306982c2cc3 100644 --- a/src/sage/modules/vector_callable_symbolic_dense.py +++ b/src/sage/modules/vector_callable_symbolic_dense.py @@ -50,8 +50,7 @@ #***************************************************************************** from . import free_module_element -from sage.misc.lazy_import import lazy_import -lazy_import("sage.symbolic.ring", "SR") +from sage.symbolic.ring import SR class Vector_callable_symbolic_dense(free_module_element.FreeModuleElement_generic_dense): diff --git a/src/sage/modules/vector_symbolic_dense.py b/src/sage/modules/vector_symbolic_dense.py index 3c3eeb8ff53..12152d97fcb 100644 --- a/src/sage/modules/vector_symbolic_dense.py +++ b/src/sage/modules/vector_symbolic_dense.py @@ -55,8 +55,7 @@ #***************************************************************************** from . import free_module_element -from sage.misc.lazy_import import lazy_import -lazy_import("sage.symbolic.all", "Expression") +from sage.symbolic.all import Expression def apply_map(phi): diff --git a/src/sage/plot/hyperbolic_regular_polygon.py b/src/sage/plot/hyperbolic_regular_polygon.py index fc4d96e29e7..59ca5aa29d3 100644 --- a/src/sage/plot/hyperbolic_regular_polygon.py +++ b/src/sage/plot/hyperbolic_regular_polygon.py @@ -23,9 +23,7 @@ from sage.misc.decorators import options, rename_keyword from sage.misc.lazy_import import lazy_import lazy_import("sage.symbolic.constants", "pi", "e") -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.hyperbolic", "arccosh") -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.trig", "sin", "cos, cot") from sage.misc.functional import is_odd from sage.matrix.constructor import matrix diff --git a/src/sage/quadratic_forms/quadratic_form__mass__Siegel_densities.py b/src/sage/quadratic_forms/quadratic_form__mass__Siegel_densities.py index c7c0b53e66d..bfedf07a905 100644 --- a/src/sage/quadratic_forms/quadratic_form__mass__Siegel_densities.py +++ b/src/sage/quadratic_forms/quadratic_form__mass__Siegel_densities.py @@ -22,7 +22,6 @@ lazy_import("sage.functions.all", "sgn") from sage.quadratic_forms.special_values import gamma__exact, zeta__exact, quadratic_L_function__exact from sage.misc.functional import squarefree_part -from sage.misc.lazy_import import lazy_import lazy_import("sage.symbolic.constants", "pi") from sage.matrix.matrix_space import MatrixSpace diff --git a/src/sage/quadratic_forms/quadratic_form__reduction_theory.py b/src/sage/quadratic_forms/quadratic_form__reduction_theory.py index a579e394a5d..72d0e3e21b1 100644 --- a/src/sage/quadratic_forms/quadratic_form__reduction_theory.py +++ b/src/sage/quadratic_forms/quadratic_form__reduction_theory.py @@ -4,7 +4,7 @@ from copy import deepcopy from sage.matrix.constructor import matrix from sage.misc.lazy_import import lazy_import -lazy_import("sage.functions.all", "floor") +lazy_import("sage.functions.other", "floor") from sage.misc.mrange import mrange from sage.modules.free_module_element import vector from sage.rings.integer_ring import ZZ diff --git a/src/sage/quadratic_forms/quadratic_form__split_local_covering.py b/src/sage/quadratic_forms/quadratic_form__split_local_covering.py index 49f45d7eac2..1eb27c29b7c 100644 --- a/src/sage/quadratic_forms/quadratic_form__split_local_covering.py +++ b/src/sage/quadratic_forms/quadratic_form__split_local_covering.py @@ -17,7 +17,7 @@ from sage.matrix.matrix_space import MatrixSpace from sage.matrix.constructor import matrix from sage.misc.lazy_import import lazy_import -lazy_import("sage.functions.all", "floor") +lazy_import("sage.functions.other", "floor") from sage.rings.integer_ring import ZZ from sage.arith.all import GCD diff --git a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py index 7de68e084f3..e3aaac967fb 100644 --- a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py +++ b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py @@ -203,9 +203,7 @@ from sage.rings.ring import Ring from sage.misc.lazy_import import lazy_import lazy_import("sage.calculus.var", "var") -from sage.misc.lazy_import import lazy_import lazy_import("sage.calculus.functional", "diff") -from sage.misc.lazy_import import lazy_import lazy_import("sage.symbolic.ring", "SR") from sage.misc.misc_c import prod from sage.rings.integer import Integer diff --git a/src/sage/rings/number_field/S_unit_solver.py b/src/sage/rings/number_field/S_unit_solver.py index 1b98966cae1..5c7f4939803 100644 --- a/src/sage/rings/number_field/S_unit_solver.py +++ b/src/sage/rings/number_field/S_unit_solver.py @@ -61,7 +61,6 @@ from sage.rings.integer_ring import ZZ from sage.rings.real_mpfr import RealField, RR from sage.rings.complex_mpfr import ComplexField -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.log", "exp") from sage.rings.rational_field import QQ from sage.rings.number_field.number_field import is_real_place, refine_embedding diff --git a/src/sage/rings/polynomial/binary_form_reduce.py b/src/sage/rings/polynomial/binary_form_reduce.py index 9d465190389..e37469892e3 100644 --- a/src/sage/rings/polynomial/binary_form_reduce.py +++ b/src/sage/rings/polynomial/binary_form_reduce.py @@ -28,9 +28,7 @@ from sage.misc.lazy_import import lazy_import lazy_import("sage.calculus.functions", "jacobian") -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.hyperbolic", "cosh", "sinh") -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.log", "exp") from sage.matrix.constructor import matrix from sage.misc.misc_c import prod diff --git a/src/sage/schemes/cyclic_covers/cycliccover_finite_field.py b/src/sage/schemes/cyclic_covers/cycliccover_finite_field.py index 16c1f05a037..1e993e63e2c 100644 --- a/src/sage/schemes/cyclic_covers/cycliccover_finite_field.py +++ b/src/sage/schemes/cyclic_covers/cycliccover_finite_field.py @@ -69,7 +69,7 @@ from sage.arith.misc import euler_phi from sage.misc.lazy_import import lazy_import -lazy_import("sage.functions.other", "ceil", "binomial, floor") +lazy_import("sage.functions.other", ["ceil", "binomial", "floor"]) lazy_import("sage.functions.log", "log") from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing from sage.rings.power_series_ring import PowerSeriesRing diff --git a/src/sage/schemes/elliptic_curves/ell_rational_field.py b/src/sage/schemes/elliptic_curves/ell_rational_field.py index 3f10a17e380..f5d8bc5a448 100644 --- a/src/sage/schemes/elliptic_curves/ell_rational_field.py +++ b/src/sage/schemes/elliptic_curves/ell_rational_field.py @@ -92,7 +92,6 @@ import sage.matrix.all as matrix from sage.libs.pari.all import pari -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.gamma", "gamma_inc") from math import sqrt from sage.interfaces.gp import gp diff --git a/src/sage/schemes/elliptic_curves/height.py b/src/sage/schemes/elliptic_curves/height.py index c7db88e30de..6b7ff5d40b2 100644 --- a/src/sage/schemes/elliptic_curves/height.py +++ b/src/sage/schemes/elliptic_curves/height.py @@ -45,8 +45,7 @@ from sage.arith.all import lcm, factorial from sage.ext.fast_callable import fast_callable from sage.misc.lazy_import import lazy_import -lazy_import("sage.functions.log", "log", "exp") -from sage.misc.lazy_import import lazy_import +lazy_import("sage.functions.log", ["log", "exp"]) lazy_import("sage.symbolic.ring", "SR") diff --git a/src/sage/schemes/elliptic_curves/padic_lseries.py b/src/sage/schemes/elliptic_curves/padic_lseries.py index f11ce83a7ca..bf726eb16f8 100644 --- a/src/sage/schemes/elliptic_curves/padic_lseries.py +++ b/src/sage/schemes/elliptic_curves/padic_lseries.py @@ -81,10 +81,10 @@ import sage.schemes.hyperelliptic_curves.monsky_washnitzer from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.log", "log") -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.other", "floor") from sage.misc.cachefunc import cached_method + @richcmp_method class pAdicLseries(SageObject): r""" diff --git a/src/sage/stats/distributions/discrete_gaussian_lattice.py b/src/sage/stats/distributions/discrete_gaussian_lattice.py index 0ffe153ec41..ccd410978f4 100644 --- a/src/sage/stats/distributions/discrete_gaussian_lattice.py +++ b/src/sage/stats/distributions/discrete_gaussian_lattice.py @@ -58,7 +58,6 @@ from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.log", "exp") -from sage.misc.lazy_import import lazy_import lazy_import("sage.functions.other", "ceil") from sage.rings.all import RealField, RR, ZZ, QQ from .discrete_gaussian_integer import DiscreteGaussianDistributionIntegerSampler