New ZODB uses zodbpickle instead of cPickle

product/ERP5Type/mixin/temporary.py

@@ -26,7 +26,11 @@
 #
 ##############################################################################
 
-from cPickle import PicklingError
+try:
+  from ZODB._compat import cPickle
+  PicklingError = cPickle.PicklingError
+except ImportError: # BBB: ZODB < 4
+  from cPickle import PicklingError
 from Acquisition import aq_base
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as \
   PropertyConstantGetter

product/ERP5Type/tests/testERP5Type.py

@@ -26,7 +26,10 @@
 #
 ##############################################################################
 
-import cPickle
+try:
+  from ZODB._compat import cPickle
+except ImportError: # BBB: ZODB < 4
+  import cPickle
 import unittest
 import sys