diff options
| author | Christopher Long <indirecthit@gmail.com> | 2006-08-20 22:49:48 +0000 |
|---|---|---|
| committer | Christopher Long <indirecthit@gmail.com> | 2006-08-20 22:49:48 +0000 |
| commit | 49c1c2fdd3a4b997aa009faf85a9ae6665fa4e00 (patch) | |
| tree | 481132d05d747ddbb998bdce57fc516fbc88438d /django/core | |
| parent | 455842e07e44c63f45850e7471b1f19826af6235 (diff) | |
[per-object-permissions] Update to trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/per-object-permissions@3630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core')
| -rw-r--r-- | django/core/cache/backends/memcached.py | 2 |
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) |