From 5c88edafacbddee659c53fd5fa62482c6bc33c19 Mon Sep 17 00:00:00 2001 From: Nicolas Dumazet <nicolas.dumazet@nexedi.com> Date: Thu, 21 Oct 2010 08:51:02 +0000 Subject: [PATCH] naming convention: dynamic instead of Dynamic for module git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39426 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5Type/Tool/TypesTool.py | 2 +- product/ERP5Type/Utils.py | 2 +- product/ERP5Type/__init__.py | 2 +- product/ERP5Type/{Dynamic => dynamic}/__init__.py | 0 .../ERP5Type/{Dynamic => dynamic}/dynamicmodule.py | 0 product/ERP5Type/{Dynamic => dynamic}/lazyclass.py | 0 .../{Dynamic => dynamic}/portaltypeclass.py | 14 +++++++------- 7 files changed, 10 insertions(+), 10 deletions(-) rename product/ERP5Type/{Dynamic => dynamic}/__init__.py (100%) rename product/ERP5Type/{Dynamic => dynamic}/dynamicmodule.py (100%) rename product/ERP5Type/{Dynamic => dynamic}/lazyclass.py (100%) rename product/ERP5Type/{Dynamic => dynamic}/portaltypeclass.py (97%) diff --git a/product/ERP5Type/Tool/TypesTool.py b/product/ERP5Type/Tool/TypesTool.py index a80984b800..9ebaac2e54 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.portaltypeclass import synchronizeDynamicModules class ComposedObjectIds(object): diff --git a/product/ERP5Type/Utils.py b/product/ERP5Type/Utils.py index 0e510a3c89..7bd835833d 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.dynamicmodule 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 65e65f61ee..01b920774d 100644 --- a/product/ERP5Type/__init__.py +++ b/product/ERP5Type/__init__.py @@ -99,7 +99,7 @@ def initialize( context ): content_constructors = content_constructors, content_classes = content_classes) - from Dynamic import portaltypeclass + from dynamic import portaltypeclass portaltypeclass.initializeDynamicModules() # Register our Workflow factories directly (if on CMF 2) diff --git a/product/ERP5Type/Dynamic/__init__.py b/product/ERP5Type/dynamic/__init__.py similarity index 100% rename from product/ERP5Type/Dynamic/__init__.py rename to product/ERP5Type/dynamic/__init__.py diff --git a/product/ERP5Type/Dynamic/dynamicmodule.py b/product/ERP5Type/dynamic/dynamicmodule.py similarity index 100% rename from product/ERP5Type/Dynamic/dynamicmodule.py rename to product/ERP5Type/dynamic/dynamicmodule.py diff --git a/product/ERP5Type/Dynamic/lazyclass.py b/product/ERP5Type/dynamic/lazyclass.py similarity index 100% rename from product/ERP5Type/Dynamic/lazyclass.py rename to product/ERP5Type/dynamic/lazyclass.py diff --git a/product/ERP5Type/Dynamic/portaltypeclass.py b/product/ERP5Type/dynamic/portaltypeclass.py similarity index 97% rename from product/ERP5Type/Dynamic/portaltypeclass.py rename to product/ERP5Type/dynamic/portaltypeclass.py index 0e82ba3853..d8e4e68378 100644 --- a/product/ERP5Type/Dynamic/portaltypeclass.py +++ b/product/ERP5Type/dynamic/portaltypeclass.py @@ -80,7 +80,7 @@ def _fillAccessorHolderList(accessor_holder_list, except AttributeError: # Not too critical - LOG("ERP5Type.Dynamic", ERROR, + LOG("ERP5Type.dynamic", ERROR, "Ignoring missing Property Sheet " + property_sheet_name) else: @@ -89,7 +89,7 @@ def _fillAccessorHolderList(accessor_holder_list, accessor_holder_list.append(accessor_holder_class) - LOG("ERP5Type.Dynamic", INFO, + LOG("ERP5Type.dynamic", INFO, "Created accessor holder for %s in %s" % (property_sheet_name, accessor_holder_module)) @@ -100,7 +100,7 @@ def portalTypeFactory(portal_type_name): and computes __bases__ and __dict__ for the class that will be created to represent this portal type """ - #LOG("ERP5Type.Dynamic", 0, "Loading portal type %s..." % portal_type_name) + #LOG("ERP5Type.dynamic", 0, "Loading portal type %s..." % portal_type_name) mixin_list = [] interface_list = [] @@ -128,7 +128,7 @@ def portalTypeFactory(portal_type_name): interface_list = portal_type.getTypeInterfaceList() except StandardError: # log loudly the error, but it's not _critical_ - LOG("ERP5Type.Dynamic", ERROR, + LOG("ERP5Type.dynamic", ERROR, "Could not load interfaces or Mixins for portal type %s" \ % portal_type_name) @@ -173,7 +173,7 @@ def portalTypeFactory(portal_type_name): # erp5.filesystem_accessor_holder, # FilesystemPropertySheet) - # LOG("ERP5Type.Dynamic", INFO, + # LOG("ERP5Type.dynamic", INFO, # "%s: accessor_holder_list: %s" % (portal_type_name, # accessor_holder_list)) @@ -184,7 +184,7 @@ def portalTypeFactory(portal_type_name): baseclasses = [klass] + accessor_holder_list + mixin_class_list - #LOG("ERP5Type.Dynamic", INFO, + #LOG("ERP5Type.dynamic", INFO, # "Portal type %s loaded with bases %s" \ # % (portal_type_name, repr(baseclasses))) @@ -303,7 +303,7 @@ def synchronizeDynamicModules(context, force=False): return last_sync = cookie - LOG("ERP5Type.Dynamic", 0, "Resetting dynamic classes") + LOG("ERP5Type.dynamic", 0, "Resetting dynamic classes") import erp5 -- 2.30.9