From b1c44f59a82702e7e673dccbdd8262db5bc967b6 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Sat, 26 Feb 2011 15:22:15 -0600 Subject: [PATCH] making pickled caches block no execution --- src/gvoice/addressbook.py | 2 +- src/gvoice/conversations.py | 2 +- src/gvoice/locations.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gvoice/addressbook.py b/src/gvoice/addressbook.py index 33f514a..4b3793b 100644 --- a/src/gvoice/addressbook.py +++ b/src/gvoice/addressbook.py @@ -40,7 +40,7 @@ class Addressbook(object): try: with open(path, "rb") as f: fileVersion, fileBuild, contacts = pickle.load(f) - except (pickle.PickleError, IOError, EOFError, ValueError): + except (pickle.PickleError, IOError, EOFError, ValueError, Exception): _moduleLogger.exception("While loading") return diff --git a/src/gvoice/conversations.py b/src/gvoice/conversations.py index 7cad027..64dafb8 100644 --- a/src/gvoice/conversations.py +++ b/src/gvoice/conversations.py @@ -48,7 +48,7 @@ class Conversations(object): try: with open(path, "rb") as f: fileVersion, fileBuild, convs = pickle.load(f) - except (pickle.PickleError, IOError, EOFError, ValueError): + except (pickle.PickleError, IOError, EOFError, ValueError, Exception): _moduleLogger.exception("While loading for %s" % self._name) return diff --git a/src/gvoice/locations.py b/src/gvoice/locations.py index ed85620..6b0d124 100644 --- a/src/gvoice/locations.py +++ b/src/gvoice/locations.py @@ -45,7 +45,7 @@ class Locations(object): try: with open(path, "rb") as f: fileVersion, fileBuild, locs = pickle.load(f) - except (pickle.PickleError, IOError, EOFError, ValueError): + except (pickle.PickleError, IOError, EOFError, ValueError, Exception): _moduleLogger.exception("While loading for %s" % self._name) return -- 1.7.9.5