diff --git a/product/ERP5Type/mixin/temporary.py b/product/ERP5Type/mixin/temporary.py index 7a1f6e5cdfcc9df9fbb0260241b99e9d89a6fe9e..6d81773e766137f03018edadfa4ac5c4b16ef750 100644 --- a/product/ERP5Type/mixin/temporary.py +++ b/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 diff --git a/product/ERP5Type/tests/testERP5Type.py b/product/ERP5Type/tests/testERP5Type.py index 204cddc7ce400a5346db3ddead59e86cda67df5d..74cb56243b4eef0ce561a945faf2aa70db8f0661 100644 --- a/product/ERP5Type/tests/testERP5Type.py +++ b/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