From a483495c2179f63bbfd6f9cf89ba332b02ef147d Mon Sep 17 00:00:00 2001 From: Nicolas Dumazet <nicolas.dumazet@nexedi.com> Date: Thu, 21 Oct 2010 08:56:04 +0000 Subject: [PATCH] naming guidelines: one_two instead of onetwo git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39427 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5Type/Tool/TypesTool.py | 2 +- product/ERP5Type/Utils.py | 2 +- product/ERP5Type/__init__.py | 4 ++-- .../ERP5Type/dynamic/{dynamicmodule.py => dynamic_module.py} | 0 product/ERP5Type/dynamic/{lazyclass.py => lazy_class.py} | 0 .../dynamic/{portaltypeclass.py => portal_type_class.py} | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) rename product/ERP5Type/dynamic/{dynamicmodule.py => dynamic_module.py} (100%) rename product/ERP5Type/dynamic/{lazyclass.py => lazy_class.py} (100%) rename product/ERP5Type/dynamic/{portaltypeclass.py => portal_type_class.py} (99%) diff --git a/product/ERP5Type/Tool/TypesTool.py b/product/ERP5Type/Tool/TypesTool.py index 9ebaac2e54..c72c1aa729 100644 --- a/product/ERP5Type/Tool/TypesTool.py +++ b/product/ERP5Type/Tool/TypesTool.py @@ -29,7 +29,7 @@ from Products.ERP5Type.ERP5Type import ERP5TypeInformation from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod from zLOG import LOG, WARNING, PANIC from Products.ERP5Type.interfaces import ITypeProvider, ITypesTool -from Products.ERP5Type.dynamic.portaltypeclass import synchronizeDynamicModules +from Products.ERP5Type.dynamic.portal_type_class import synchronizeDynamicModules class ComposedObjectIds(object): diff --git a/product/ERP5Type/Utils.py b/product/ERP5Type/Utils.py index 7bd835833d..17354a28e9 100644 --- a/product/ERP5Type/Utils.py +++ b/product/ERP5Type/Utils.py @@ -967,7 +967,7 @@ def importLocalDocument(class_id, document_path = None): return MigrateMe else: return klass - from dynamic.dynamicmodule import newDynamicModule + from dynamic.dynamic_module import newDynamicModule document_module = newDynamicModule(module_name, migrate_me_document_loader) setattr(Products.ERP5Type.Document, class_id, document_module) diff --git a/product/ERP5Type/__init__.py b/product/ERP5Type/__init__.py index 01b920774d..243e9fbd64 100644 --- a/product/ERP5Type/__init__.py +++ b/product/ERP5Type/__init__.py @@ -99,8 +99,8 @@ def initialize( context ): content_constructors = content_constructors, content_classes = content_classes) - from dynamic import portaltypeclass - portaltypeclass.initializeDynamicModules() + from dynamic.portal_type_class import initializeDynamicModules + initializeDynamicModules() # Register our Workflow factories directly (if on CMF 2) Products.ERP5Type.Workflow.registerAllWorkflowFactories(context) diff --git a/product/ERP5Type/dynamic/dynamicmodule.py b/product/ERP5Type/dynamic/dynamic_module.py similarity index 100% rename from product/ERP5Type/dynamic/dynamicmodule.py rename to product/ERP5Type/dynamic/dynamic_module.py diff --git a/product/ERP5Type/dynamic/lazyclass.py b/product/ERP5Type/dynamic/lazy_class.py similarity index 100% rename from product/ERP5Type/dynamic/lazyclass.py rename to product/ERP5Type/dynamic/lazy_class.py diff --git a/product/ERP5Type/dynamic/portaltypeclass.py b/product/ERP5Type/dynamic/portal_type_class.py similarity index 99% rename from product/ERP5Type/dynamic/portaltypeclass.py rename to product/ERP5Type/dynamic/portal_type_class.py index d8e4e68378..4dc532bbbc 100644 --- a/product/ERP5Type/dynamic/portaltypeclass.py +++ b/product/ERP5Type/dynamic/portal_type_class.py @@ -32,8 +32,8 @@ import inspect from types import ModuleType -from dynamicmodule import newDynamicModule -from lazyclass import newLazyClass +from dynamic_module import newDynamicModule +from lazy_class import newLazyClass from Products.ERP5Type.Globals import InitializeClass from Products.ERP5Type.Utils import setDefaultClassProperties -- 2.30.9