From cf7ddc576583a15dec0800f4146c2e979795bf30 Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Sat, 23 Nov 2013 18:55:28 +0100 Subject: Follow up to e112654fc81ddb3fbffbb8382b004d69367a85fe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Actually comitted the code now :รพ --- django/core/cache/backends/locmem.py | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'django/core/cache') diff --git a/django/core/cache/backends/locmem.py b/django/core/cache/backends/locmem.py index cab690bb0c..73b02a55b3 100644 --- a/django/core/cache/backends/locmem.py +++ b/django/core/cache/backends/locmem.py @@ -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): -- cgit v1.3