From cb609bd4258fd3e7b4f4caff4828ed947833f995 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 3 Feb 2016 02:25:09 +0100
Subject: [PATCH] [FIX] tools.misc: log errors when parsing fails

---
 openerp/tools/misc.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 90b89eeb99a..3d47e6f2e71 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -1094,11 +1094,15 @@ def stripped_sys_argv(*strip_args):
 
 class Pickle(object):
     @classmethod
-    def load(cls, stream):
+    def load(cls, stream, errors=False):
         unpickler = cPickle.Unpickler(stream)
         # pickle builtins: str/unicode, int/long, float, bool, tuple, list, dict, None
         unpickler.find_global = None
-        return unpickler.load()
+        try:
+            return unpickler.load()
+        except Exception:
+            _logger.warning('Failed unpickling data, returning default: %r', errors, exc_info=True)
+            return errors
 
     @classmethod
     def loads(cls, text):