Better fix for serializing/deserializing cache plugins (v2)

lib/ansible/plugins/cache/base.py

@@ -26,9 +26,6 @@ from six import add_metaclass
 @add_metaclass(ABCMeta)
 class BaseCacheModule:
 
-    def __init__(self):
-        self.__getstate__ = self.copy
-
     @abstractmethod
     def get(self, key):
         pass

lib/ansible/plugins/cache/memcached.py

@@ -113,8 +113,6 @@ class CacheModuleKeys(collections.MutableSet):
         self._cache = cache
         self._keyset = dict(*args, **kwargs)
 
-        super(CacheModule, self).__init__()
-
     def __contains__(self, key):
         return key in self._keyset
 
@@ -193,3 +191,9 @@ class CacheModule(BaseCacheModule):
 
     def copy(self):
         return self._keys.copy()
+
+    def __getstate__(self):
+        return dict()
+
+    def __setstate__(self, data):
+        self.__init__()

lib/ansible/plugins/cache/memory.py

@@ -24,8 +24,6 @@ class CacheModule(BaseCacheModule):
     def __init__(self, *args, **kwargs):
         self._cache = {}
 
-        super(CacheModule, self).__init__()
-
     def get(self, key):
         return self._cache.get(key)
 
@@ -46,3 +44,9 @@ class CacheModule(BaseCacheModule):
 
     def copy(self):
         return self._cache.copy()
+
+    def __getstate__(self):
+        return self.copy()
+
+    def __setstate__(self, data):
+        self._cache = data

lib/ansible/plugins/cache/redis.py

@@ -51,8 +51,6 @@ class CacheModule(BaseCacheModule):
         self._cache = StrictRedis(*connection)
         self._keys_set = 'ansible_cache_keys'
 
-        super(CacheModule, self).__init__()
-
     def _make_key(self, key):
         return self._prefix + key
 
@@ -103,3 +101,8 @@ class CacheModule(BaseCacheModule):
             ret[key] = self.get(key)
         return ret
 
+    def __getstate__(self):
+        return dict()
+
+    def __setstate__(self, data):
+        self.__init__()