diff --git a/product/ERP5Type/Tool/CacheTool.py b/product/ERP5Type/Tool/CacheTool.py index c836908569aac8071244240d7e6160b82698b97c..8cd007bde054768811fa0a3f777ec454dc888826 100644 --- a/product/ERP5Type/Tool/CacheTool.py +++ b/product/ERP5Type/Tool/CacheTool.py @@ -33,7 +33,9 @@ from Products.ERP5Type.Tool.BaseTool import BaseTool from Products.ERP5Type import Permissions from Globals import InitializeClass, DTMLFile, PersistentMapping from Products.ERP5Type import _dtmldir -from Products.ERP5Type.Cache import * +from Products.ERP5Type.Cache import CacheFactory +from Products.ERP5Type.Cache import CachingMethod +from Products.ERP5Type.Cache import DEFAULT_CACHE_FACTORY from Products.ERP5Type.CachePlugins.RamCache import RamCache from Products.ERP5Type.CachePlugins.DistributedRamCache import DistributedRamCache from Products.ERP5Type.CachePlugins.SQLCache import SQLCache diff --git a/product/ERP5Type/patches/XMLExportImport.py b/product/ERP5Type/patches/XMLExportImport.py index fb0b9e6109deb668931a1eb68902df5dc74a479c..a2f26b8249ba5bd679a6f6f3b3304b8b6f465d94 100644 --- a/product/ERP5Type/patches/XMLExportImport.py +++ b/product/ERP5Type/patches/XMLExportImport.py @@ -24,7 +24,9 @@ except ImportError: from ZODB.ExportImport import TemporaryFile from pickle import Pickler, EMPTY_DICT, MARK, DICT from cPickle import loads, dumps -from types import * +from types import TupleType +from types import StringType +from types import DictionaryType from OFS import XMLExportImport # Jython has PyStringMap; it's a dict subclass with string keys