diff --git a/product/ERP5Type/Dynamic/dynamicmodule.py b/product/ERP5Type/Dynamic/dynamicmodule.py index e302c472ad987ed5b98493f84b33a8ba838fb67d..0a20dbd555756174c059e088992081f9438b498d 100644 --- a/product/ERP5Type/Dynamic/dynamicmodule.py +++ b/product/ERP5Type/Dynamic/dynamicmodule.py @@ -19,7 +19,7 @@ class DynamicModule(ModuleType): setattr(self, name, obj) return obj -def dynamicmodule(name, factory): +def newDynamicModule(name, factory): d = DynamicModule(name, factory) sys.modules[name] = d return d diff --git a/product/ERP5Type/Dynamic/portaltypeclass.py b/product/ERP5Type/Dynamic/portaltypeclass.py index 1956d4a9707f8f175382f75ff284a06a869c7421..7f8d8b83d1adbb519428f7d1c4c8cb4ec9373c34 100644 --- a/product/ERP5Type/Dynamic/portaltypeclass.py +++ b/product/ERP5Type/Dynamic/portaltypeclass.py @@ -32,7 +32,7 @@ import inspect from types import ModuleType -import dynamicmodule +from dynamicmodule import newDynamicModule import lazyclass from Products.ERP5Type.Globals import InitializeClass @@ -249,9 +249,8 @@ def initializeDynamicModules(): erp5.filesystem_accessor_holder = ModuleType("erp5.filesystem_accessor_holder") sys.modules["erp5.filesystem_accessor_holder"] = erp5.filesystem_accessor_holder - # FIXME: JPS: rename to dynamic_module.newDynamicModule()? - portal_type_container = dynamicmodule.dynamicmodule('erp5.portal_type', - portal_type_loader) + portal_type_container = newDynamicModule('erp5.portal_type', + portal_type_loader) erp5.portal_type = portal_type_container @@ -288,8 +287,8 @@ def initializeDynamicModules(): setattr(TempDocument, '%s__roles__' % method_id, None) return TempDocument - erp5.temp_portal_type = dynamicmodule.dynamicmodule('erp5.temp_portal_type', - temp_portal_type_loader) + erp5.temp_portal_type = newDynamicModule('erp5.temp_portal_type', + temp_portal_type_loader) def _clearAccessorHolderModule(module): """ diff --git a/product/ERP5Type/Utils.py b/product/ERP5Type/Utils.py index 3c66a59942996fba94d4a88b6f8f6fcb33a4439b..e0d4d1d9ca8ab9318910daf8ab728682e62f08d2 100644 --- a/product/ERP5Type/Utils.py +++ b/product/ERP5Type/Utils.py @@ -965,8 +965,8 @@ def importLocalDocument(class_id, document_path = None): return MigrateMe else: return klass - from Dynamic.dynamicmodule import dynamicmodule - document_module = dynamicmodule(module_name, migrate_me_document_loader) + from Dynamic.dynamicmodule import newDynamicModule + document_module = newDynamicModule(module_name, migrate_me_document_loader) setattr(Products.ERP5Type.Document, class_id, document_module)