Merge branch 'u/saraedum/ticket/15692' of git://trac.sagemath.org/sag…

…e into ticket/15156

src/sage/combinat/root_system/ambient_space.py

@@ -12,9 +12,8 @@
 from sage.combinat.free_module import CombinatorialFreeModule, CombinatorialFreeModuleElement
 from weight_lattice_realizations import WeightLatticeRealizations
 from sage.rings.all import ZZ, QQ
-from sage.misc.cachefunc import ClearCacheOnPickle
 
-class AmbientSpace(ClearCacheOnPickle, CombinatorialFreeModule):
+class AmbientSpace(CombinatorialFreeModule):
     r"""
     Abstract class for ambient spaces
 

src/sage/combinat/root_system/root_space.py

@@ -8,16 +8,13 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.misc.cachefunc import ClearCacheOnPickle, cached_method, cached_in_parent_method
+from sage.misc.cachefunc import cached_method, cached_in_parent_method
 from sage.rings.all import ZZ
 from sage.combinat.free_module import CombinatorialFreeModule, CombinatorialFreeModuleElement
 from root_lattice_realizations import RootLatticeRealizations
 from sage.misc.cachefunc import cached_in_parent_method
 
-# TODO: inheriting from ClearCacheOnPickle is a technical detail unrelated to root spaces
-# could we abstract this somewhere higher?
-
-class RootSpace(ClearCacheOnPickle, CombinatorialFreeModule):
+class RootSpace(CombinatorialFreeModule):
     r"""
     The root space of a root system over a given base ring
 

src/sage/combinat/root_system/weyl_group.py

@@ -41,7 +41,7 @@
 from sage.groups.matrix_gps.group_element import MatrixGroupElement_gap
 from sage.rings.all import ZZ, QQ
 from sage.interfaces.gap import gap
-from sage.misc.cachefunc import cached_method, ClearCacheOnPickle
+from sage.misc.cachefunc import cached_method
 from sage.misc.superseded import deprecated_function_alias
 from sage.combinat.root_system.cartan_type import CartanType
 from sage.combinat.root_system.cartan_matrix import CartanMatrix
@@ -197,7 +197,7 @@ def WeylGroup(x, prefix=None):
     return WeylGroup_gens(ct.root_system().root_space(), prefix=prefix)
 
 
-class WeylGroup_gens(ClearCacheOnPickle, UniqueRepresentation,
+class WeylGroup_gens(UniqueRepresentation,
                      FinitelyGeneratedMatrixGroup_gap):
 
     @staticmethod

src/sage/misc/cachefunc.pxd

@@ -12,6 +12,10 @@ cdef class CachedFunction(object):
     cpdef get_cache(self)
     cpdef clear_cache(self)
     cdef object key
+    cdef bint pickle
+
+cdef class CacheDict(dict):
+    cdef bint pickle
 
 cdef class CachedMethod
 
@@ -29,5 +33,5 @@ cdef class CachedMethod(object):
     cdef public str __module__
     cdef CachedFunction _cachedfunc
     cdef int nargs
-    cpdef dict _get_instance_cache(self, inst)
+    cpdef CacheDict _get_instance_cache(self, inst)