Commit cf7ddc57 authored by Florian Apolloner's avatar Florian Apolloner
Browse files

Follow up to e112654f 

Actually comitted the code now :þ
parent 42fef294

django/core/cache/backends/locmem.py

+7 −18
Original line number Diff line number Diff line
@@ -27,10 +27,7 @@ class LocMemCache(BaseCache): 
    def add(self, key, value, timeout=DEFAULT_TIMEOUT, version=None):

        key = self.make_key(key, version=version)

        self.validate_key(key)

        try:

        pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)

        except pickle.PickleError:

            return False

        with self._lock.writer():

            exp = self._expire_info.get(key)

            if exp is None or exp <= time.time():
@@ -69,11 +66,7 @@ class LocMemCache(BaseCache): 
    def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None):

        key = self.make_key(key, version=version)

        self.validate_key(key)

        try:

        pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)

        except pickle.PickleError:

            pass

        else:

        with self._lock.writer():

            self._set(key, pickled, timeout)
@@ -83,11 +76,7 @@ class LocMemCache(BaseCache): 
            raise ValueError("Key '%s' not found" % key)

        new_value = value + delta

        key = self.make_key(key, version=version)

        try:

        pickled = pickle.dumps(new_value, pickle.HIGHEST_PROTOCOL)

        except pickle.PickleError:

            pass

        else:

        with self._lock.writer():

            self._cache[key] = pickled

        return new_value

tests/cache/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
from __future__ import unicode_literals



import os

import pickle

import re

import shutil

import tempfile
@@ -32,6 +31,7 @@ from django.utils import timezone 
from django.utils import translation

from django.utils.cache import (patch_vary_headers, get_cache_key,

    learn_cache_key, patch_cache_control, patch_response_headers)

from django.utils.six.moves import cPickle as pickle

from django.utils.encoding import force_text

from django.views.decorators.cache import cache_page