git grep -l 'all import cached' src/sage | xargs sed -E -i.bak $'s/^(…

… *)from sage.*all import (cached_[a-z]*) *$/\1from sage.misc.cachefunc import \2/'

src/sage/combinat/alternating_sign_matrix.py

@@ -44,7 +44,7 @@
 from sage.matrix.matrix_space import MatrixSpace
 from sage.matrix.constructor import matrix
 from sage.modules.free_module_element import zero_vector
-from sage.misc.all import cached_method
+from sage.misc.cachefunc import cached_method
 from sage.rings.integer_ring import ZZ
 from sage.arith.all import factorial
 from sage.rings.integer import Integer

src/sage/combinat/cluster_algebra_quiver/mutation_type.py

@@ -25,7 +25,7 @@
 
 from copy import copy
 
-from sage.misc.all import cached_function
+from sage.misc.cachefunc import cached_function
 from sage.misc.flatten import flatten
 from sage.graphs.all import DiGraph
 from sage.combinat.all import Combinations

src/sage/combinat/cluster_algebra_quiver/quiver_mutation_type.py

@@ -22,7 +22,7 @@
 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.misc.cachefunc import cached_method
 from sage.rings.all import ZZ, infinity
 from sage.graphs.all import Graph, DiGraph
 from sage.arith.all import binomial, euler_phi

src/sage/combinat/root_system/integrable_representations.py

@@ -15,7 +15,7 @@
 from sage.structure.category_object import CategoryObject
 from sage.categories.modules import Modules
 from sage.rings.integer_ring import ZZ
-from sage.misc.all import cached_method
+from sage.misc.cachefunc import cached_method
 from sage.matrix.constructor import Matrix
 from sage.sets.recursively_enumerated_set import RecursivelyEnumeratedSet
 from sage.combinat.root_system.weyl_characters import WeylCharacterRing

src/sage/combinat/root_system/root_system.py

@@ -20,7 +20,7 @@
 from .cartan_type import CartanType
 from sage.rings.integer_ring import ZZ
 from sage.rings.rational_field import QQ
-from sage.misc.all import cached_method
+from sage.misc.cachefunc import cached_method
 from .root_space import RootSpace
 from .weight_space import WeightSpace
 

src/sage/combinat/sidon_sets.py

@@ -12,8 +12,8 @@
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 from sage.sets.set import Set
-from sage.misc.all import cached_function
-from sage.rings.all import Integer
+from sage.misc.cachefunc import cached_function
+from sage.rings.integer import Integer
 
 
 def sidon_sets(N, g = 1):

src/sage/modular/modform/eisenstein_submodule.py

@@ -4,7 +4,7 @@
 """
 
 from sage.structure.all import Sequence
-from sage.misc.all import cached_method
+from sage.misc.cachefunc import cached_method
 import sage.rings.all as rings
 from sage.categories.all import Objects
 from sage.matrix.all import Matrix

src/sage/modules/filtered_vector_space.py

@@ -113,7 +113,7 @@
 from sage.categories.fields import Fields
 from sage.modules.free_module import FreeModule_ambient_field, VectorSpace
 from sage.matrix.constructor import matrix
-from sage.misc.all import cached_method
+from sage.misc.cachefunc import cached_method
 
 
 def is_FilteredVectorSpace(X):

src/sage/modules/multi_filtered_vector_space.py

@@ -43,7 +43,7 @@
 from sage.rings.infinity import infinity, minus_infinity
 from sage.categories.fields import Fields
 from sage.modules.free_module import FreeModule_ambient_field, VectorSpace
-from sage.misc.all import cached_method
+from sage.misc.cachefunc import cached_method
 from sage.modules.filtered_vector_space import FilteredVectorSpace
 
 

src/sage/monoids/automatic_semigroup.py

@@ -20,7 +20,7 @@
 # ****************************************************************************
 
 import operator
-from sage.misc.all import cached_method
+from sage.misc.cachefunc import cached_method
 from sage.categories.semigroups import Semigroups
 from sage.categories.sets_cat import Sets
 from sage.categories.monoids import Monoids

src/sage/schemes/elliptic_curves/cm.py

@@ -41,7 +41,7 @@
                             is_fundamental_discriminant,
                             PolynomialRing)
 
-from sage.misc.all import cached_function
+from sage.misc.cachefunc import cached_function
 
 @cached_function
 def hilbert_class_polynomial(D, algorithm=None):

src/sage/schemes/elliptic_curves/padics.py

@@ -39,7 +39,7 @@
 sqrt = math.sqrt
 import sage.schemes.hyperelliptic_curves.monsky_washnitzer
 import sage.schemes.hyperelliptic_curves.hypellfrob
-from sage.misc.all import cached_method
+from sage.misc.cachefunc import cached_method
 
 def __check_padic_hypotheses(self, p):
     r"""

src/sage/schemes/generic/scheme.py

@@ -20,7 +20,7 @@
 # ****************************************************************************
 
 from sage.structure.parent import Parent
-from sage.misc.all import cached_method
+from sage.misc.cachefunc import cached_method
 from sage.rings.all import (ZZ, CommutativeRing)
 from sage.rings.ideal import is_Ideal
 from sage.structure.unique_representation import UniqueRepresentation

src/sage/schemes/toric/morphism.py

@@ -371,7 +371,7 @@
 from sage.structure.sequence import Sequence
 from sage.rings.integer_ring import ZZ
 from sage.arith.all import gcd
-from sage.misc.all import cached_method
+from sage.misc.cachefunc import cached_method
 from sage.matrix.constructor import matrix, identity_matrix
 from sage.modules.free_module_element import vector
 from sage.geometry.all import Cone, Fan

src/sage/schemes/toric/sheaf/klyachko.py

@@ -48,7 +48,7 @@
 from sage.structure.all import SageObject
 from sage.structure.richcmp import richcmp_method, richcmp, richcmp_not_equal
 from sage.rings.integer_ring import ZZ
-from sage.misc.all import cached_method
+from sage.misc.cachefunc import cached_method
 from sage.matrix.constructor import vector, block_matrix, zero_matrix
 from sage.geometry.cone import is_Cone
 from sage.modules.multi_filtered_vector_space import MultiFilteredVectorSpace