Ticket #16378: 16378.diff

django/core/cache/backends/locmem.py

@@ -31 +31 @@
             exp = self._expire_info.get(key)
             if exp is None or exp <= time.time():
                 try:
-                    self._set(key, pickle.dumps(value), timeout)
+                    pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)
+                    self._set(key, pickled, timeout)
                     return True
                 except pickle.PickleError:
                     pass
@@ -49 +50 @@
                 return default
             elif exp > time.time():
                 try:
-                    return pickle.loads(self._cache[key])
+                    pickled = self._cache[key]
+                    return pickle.loads(pickled)
                 except pickle.PickleError:
                     return default
         finally:
@@ -78 +80 @@
         self.validate_key(key)
         self._lock.writer_enters()
         try:
-            self._set(key, pickle.dumps(value), timeout)
+            pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)
+            self._set(key, pickled, timeout)
         except pickle.PickleError:
             pass
         finally:

django/core/cache/backends/db.py

@@ -79 +79 @@
         exp = datetime.fromtimestamp(time.time() + timeout).replace(microsecond=0)
         if num > self._max_entries:
             self._cull(db, cursor, now)
-        encoded = base64.encodestring(pickle.dumps(value, 2)).strip()
+        pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)
+        encoded = base64.encodestring(pickled).strip()
         cursor.execute("SELECT cache_key, expires FROM %s WHERE cache_key = %%s" % table, [key])
         try:
             result = cursor.fetchone()