naming fixes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39428 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/Utils.py

@@ -967,8 +967,9 @@ def importLocalDocument(class_id, document_path = None):
       return MigrateMe
     else:
       return klass
-  from dynamic.dynamic_module import newDynamicModule
-  document_module = newDynamicModule(module_name, migrate_me_document_loader)
+  from dynamic.dynamic_module import registerDynamicModule
+  document_module = registerDynamicModule(module_name,
+                                          migrate_me_document_loader)
 
   setattr(Products.ERP5Type.Document, class_id, document_module)
 

product/ERP5Type/dynamic/dynamic_module.py

@@ -19,7 +19,7 @@ class DynamicModule(ModuleType):
         setattr(self, name, obj)
         return obj
 
-def newDynamicModule(name, factory):
+def registerDynamicModule(name, factory):
     d = DynamicModule(name, factory)
     sys.modules[name] = d
     return d

product/ERP5Type/dynamic/lazy_class.py

@@ -3,7 +3,8 @@ from ExtensionClass import Base as ExtensionBase
 
 from zLOG import LOG, ERROR, BLATHER
 
-def newLazyClass(name, portal_type_class_attr_getter):
+def generateLazyPortalTypeClass(portal_type_name,
+                                portal_type_class_loader):
     def load(self, attr):
         klass = None
         # self might be a subclass of a portal type class
@@ -18,12 +19,14 @@ def newLazyClass(name, portal_type_class_attr_getter):
 
         portal_type = klass.__name__
         try:
-          baseclasses, attributes = portal_type_class_attr_getter(portal_type)
+          baseclasses, attributes = portal_type_class_loader(portal_type)
         except AttributeError:
           LOG("ERP5Type.Dynamic", ERROR,
-              "Could not access Portal Type Object for type %s" % name)
+              "Could not access Portal Type Object for type %s"
+              % portal_type_name)
           import traceback; traceback.print_exc()
-          raise AttributeError("Could not access Portal Type Object for type %s" % name)
+          raise AttributeError("Could not access Portal Type Object for type %s"
+              % portal_type_name)
 
         # save the old bases to be able to restore a ghost state later
         klass.__ghostbase__ = klass.__bases__
@@ -67,4 +70,4 @@ def newLazyClass(name, portal_type_class_attr_getter):
             #    "loading attribute %s.%s..." % (name, attr))
             return load(self, attr)
 
-    return type(name, (GhostPortalType,), dict())
+    return type(portal_type_name, (GhostPortalType,), dict())

product/ERP5Type/dynamic/portal_type_class.py

@@ -32,8 +32,8 @@ import inspect
 
 from types import ModuleType
 
-from dynamic_module import newDynamicModule
-from lazy_class import newLazyClass
+from dynamic_module import registerDynamicModule
+from lazy_class import generateLazyPortalTypeClass
 
 from Products.ERP5Type.Globals import InitializeClass
 from Products.ERP5Type.Utils import setDefaultClassProperties
@@ -93,7 +93,7 @@ def _fillAccessorHolderList(accessor_holder_list,
             "Created accessor holder for %s in %s" % (property_sheet_name,
                                                       accessor_holder_module))
 
-def portalTypeFactory(portal_type_name):
+def generatePortalTypeClass(portal_type_name):
   """
   Given a portal type, look up in Types Tool the corresponding
   Base Type object holding the definition of this portal type,
@@ -209,11 +209,12 @@ def initializeDynamicModules():
   XXX: there should be only one accessor_holder once the code is
        stable and all the Property Sheets have been migrated
   """
-  def portalTypeLoader(portal_type_name):
+  def loadPortalTypeClass(portal_type_name):
     """
     Returns a lazily-loaded "portal-type as a class"
     """
-    return newLazyClass(portal_type_name, portalTypeFactory)
+    return generateLazyPortalTypeClass(portal_type_name,
+                                       generatePortalTypeClass)
 
   erp5 = ModuleType("erp5")
   sys.modules["erp5"] = erp5
@@ -225,12 +226,12 @@ def initializeDynamicModules():
   erp5.filesystem_accessor_holder = ModuleType("erp5.filesystem_accessor_holder")
   sys.modules["erp5.filesystem_accessor_holder"] = erp5.filesystem_accessor_holder
 
-  portal_type_container = newDynamicModule('erp5.portal_type',
-                                           portalTypeLoader)
+  portal_type_container = registerDynamicModule('erp5.portal_type',
+                                                loadPortalTypeClass)
 
   erp5.portal_type = portal_type_container
 
-  def tempPortalTypeLoader(portal_type_name):
+  def loadTempPortalTypeClass(portal_type_name):
     """
     Returns a class suitable for a temporary portal type
 
@@ -262,8 +263,8 @@ def initializeDynamicModules():
       setattr(TempDocument, '%s__roles__' % method_id, None)
     return TempDocument
 
-  erp5.temp_portal_type = newDynamicModule('erp5.temp_portal_type',
-                                           tempPortalTypeLoader)
+  erp5.temp_portal_type = registerDynamicModule('erp5.temp_portal_type',
+                                                loadTempPortalTypeClass)
 
 def _clearAccessorHolderModule(module):
   """