[FIX] tools.misc: log errors when parsing fails

grap · Feb 3, 2016 · cb609bd · cb609bd
1 parent bdbcbea
commit cb609bd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
@@ -1094,11 +1094,15 @@ def strip(args, i):
 
 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):