mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 22:26:08 +00:00
Code Issues 32 Releases Wiki Activity

Follow up to e112654fc8

Browse Source 
Actually comitted the code now :þ
This commit is contained in:
Florian Apolloner
2013-11-23 18:55:28 +01:00
parent 42fef29446
commit cf7ddc5765
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
django/core/cache/backends/locmem.py vendored
View File

@@ -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
pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)
with self._lock.writer():
exp = self._expire_info.get(key)
if exp is None or exp <= time.time():
@@ -69,13 +66,9 @@ 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)
pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)
with self._lock.writer():
self._set(key, pickled, timeout)
def incr(self, key, delta=1, version=None):
value = self.get(key, version=version)
@@ -83,13 +76,9 @@ 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
pickled = pickle.dumps(new_value, pickle.HIGHEST_PROTOCOL)
with self._lock.writer():
self._cache[key] = pickled
return new_value
def has_key(self, key, version=None):