diff -r b758351d191f -r cc9b7e14412b web/lib/django/core/cache/backends/locmem.py --- a/web/lib/django/core/cache/backends/locmem.py Wed May 19 17:43:59 2010 +0200 +++ b/web/lib/django/core/cache/backends/locmem.py Tue May 25 02:43:45 2010 +0200 @@ -77,7 +77,7 @@ def set(self, key, value, timeout=None): self._lock.writer_enters() - # Python 2.3 and 2.4 don't allow combined try-except-finally blocks. + # Python 2.4 doesn't allow combined try-except-finally blocks. try: try: self._set(key, pickle.dumps(value), timeout) @@ -110,8 +110,7 @@ def _cull(self): if self._cull_frequency == 0: - self._cache.clear() - self._expire_info.clear() + self.clear() else: doomed = [k for (i, k) in enumerate(self._cache) if i % self._cull_frequency == 0] for k in doomed: @@ -133,3 +132,7 @@ self._delete(key) finally: self._lock.writer_leaves() + + def clear(self): + self._cache.clear() + self._expire_info.clear()