Ticket #3012: locmem-cache-exception-fix.patch

django/core/cache/backends/locmem.py

@@ -2 +2 @@
 
 from django.core.cache.backends.simple import CacheClass as SimpleCacheClass
 from django.utils.synch import RWLock
-import copy, time
+import time
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
 
 class CacheClass(SimpleCacheClass):
     def __init__(self, host, params):
@@ -20 +24 @@
             elif exp < now:
                 should_delete = True
             else:
-                return copy.deepcopy(self._cache[key])
+                try:
+                    return pickle.loads(self._cache[key])
+                except (pickle.PickleError, TypeError):
+                    return default
         finally:
             self._lock.reader_leaves()
         if should_delete:
@@ -35 +42 @@
     def set(self, key, value, timeout=None):
         self._lock.writer_enters()
         try:
-            SimpleCacheClass.set(self, key, value, timeout)
+            try:
+                SimpleCacheClass.set(self, key, pickle.dumps(value), timeout)
+            except (pickle.PickleError, TypeError):
+                pass
         finally:
             self._lock.writer_leaves()
 

tests/regressiontests/cache/tests.py

@@ -67 +67 @@
         time.sleep(2)
         self.assertEqual(cache.get("expire"), None)
 
+    def test_unserializable_data(self):
+        # Ensure that the cache backend doesn't choke on unserializable
+        # data. (see bug #3012)
+        listiterator = iter([1, 2, 3, 4])
+        defaultvalue = "This is a default value."
+        cache.set("testiterator", listiterator)
+        cached_data = cache.get("testiterator", default=defaultvalue)
+        self.assert_(cached_data in (defaultvalue, listiterator))
+
 if __name__ == '__main__':
     unittest.main()
+ No newline at end of file