summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-12-16 04:55:52 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-12-16 04:55:52 +0000
commitf2e538281175af1618bae6f2312faa0fd6dde7d9 (patch)
tree0639ec76c054a4f32dfbd25c6df4c39f5a21eea3
parent5cbbd364c3db2b72b8b0698d5321ce23a435c1d2 (diff)
Fixed #1039 -- Changed file-based cache to cache EOFErrors during pickle. Thanks for the patch, Eugene
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/cache.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/cache.py b/django/core/cache.py
index a619dd3fbf..f237da7141 100644
--- a/django/core/cache.py
+++ b/django/core/cache.py
@@ -303,7 +303,7 @@ class _FileCache(_SimpleCache):
os.remove(fname)
else:
return pickle.load(f)
- except (IOError, OSError, pickle.PickleError):
+ except (IOError, OSError, EOFError, pickle.PickleError):
pass
return default