From 019ad538d89ba4576021c9fe0da1d3efa3066f4f Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Thu, 19 May 2011 10:03:30 +0000
Subject: [PATCH] 	* morituri/common/common.py: 	  Don't fail on
 loading pickle.

---
 ChangeLog                 | 5 +++++
 morituri/common/common.py | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index eca5bc3..5437466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-19  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/common.py:
+	  Don't fail on loading pickle.
+
 2011-05-19  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/encode.py:
diff --git a/morituri/common/common.py b/morituri/common/common.py
index a223648..4f221d6 100644
--- a/morituri/common/common.py
+++ b/morituri/common/common.py
@@ -144,7 +144,13 @@ class Persister(object):
 
         handle = open(self._path)
         import pickle
-        self.object = pickle.load(handle)
+
+        try:
+            self.object = pickle.load(handle)
+        except:
+            # can fail for various reasons; in that case, pretend we didn't
+            # load it
+            pass
 
     def delete(self):
         self.object = None