summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-08-18 15:10:08 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-08-18 15:10:08 +0000
commiteef88a6d2cf404894b5b3f1bcb4c986ddcf03a91 (patch)
treebc3131c1904dbbf987405d1ce89a5209c966502e
parente7a91d3e0666a0b2a7a518325eff623e46e345b3 (diff)
downloaddjango-eef88a6d2cf404894b5b3f1bcb4c986ddcf03a91.tar.gz
Fixed #2561 -- memcached cache backend no longer ignores default timeout. Thanks for the report and patch, Christopher Lenz
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/cache/backends/memcached.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py
index 86ae096d2c..180f95da73 100644
--- a/django/core/cache/backends/memcached.py
+++ b/django/core/cache/backends/memcached.py
@@ -20,7 +20,7 @@ class CacheClass(BaseCache):
return val
def set(self, key, value, timeout=0):
- self._cache.set(key, value, timeout)
+ self._cache.set(key, value, timeout or self.default_timeout)
def delete(self, key):
self._cache.delete(key)