Similarly as Standard Property Document, create an importFromFilesystemDefinition

in PropertySheet Document by moving code from Property Sheet Tool and
update testZodbImportFilesystemPropertySheet accordingly


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

product/ERP5Type/Core/PropertySheet.py

@@ -28,11 +28,12 @@
 
 from Products.ERP5Type.Core.Folder import Folder
 from AccessControl import ClassSecurityInfo
+from Products.CMFCore.Expression import Expression
 from Products.ERP5Type import Permissions
 from Products.ERP5Type.Base import PropertyHolder
 from Products.ERP5Type.dynamic.accessor_holder import AccessorHolderType
 
-from zLOG import LOG, INFO
+from zLOG import LOG, INFO, WARNING
 
 class PropertySheet(Folder):
   """
@@ -101,3 +102,114 @@ class PropertySheet(Folder):
       property_holder,
       self.getPortalObject(),
       'erp5.accessor_holder')
+
+  @staticmethod
+  def _guessFilesystemPropertyPortalType(attribute_dict):
+    """
+    Guess the Portal Type of a filesystem-based Property Sheet from
+    the attributes of the given property
+    """
+    for key in attribute_dict:
+      if key.startswith('acqui') or \
+         key in ('alt_accessor_id',
+                 # Specific to 'content' type
+                 'portal_type',
+                 'translation_acquired_property'):
+        return 'Acquired Property'
+
+    return 'Standard Property'
+
+  # The following filesystem definitions have been merged into another
+  # Portal Type
+  _merged_portal_type_dict = {
+    'CategoryAcquiredExistence': 'Category Existence Constraint',
+    'CategoryAcquiredMembershipArity': 'Category Membership Arity Constraint'}
+
+  security.declareProtected(Permissions.ModifyPortalContent,
+                            'importFromFilesystemDefinition')
+  @classmethod
+  def importFromFilesystemDefinition(cls, context, definition_class):
+    """
+    Create a new Property Sheet in the given context from a given
+    filesystem-based Property Sheet definition
+    """
+    property_sheet_name = definition_class.__name__
+
+    property_sheet = context.newContent(id=property_sheet_name,
+                                        portal_type='Property Sheet')
+
+    types_tool = context.getPortalObject().portal_types
+
+    for attribute_dict in getattr(definition_class, '_properties', []):
+      # The property could be either a Standard or an Acquired
+      # Property
+      portal_type_class = types_tool.getPortalTypeClass(
+        cls._guessFilesystemPropertyPortalType(attribute_dict))
+
+      # Create the new property and set its attributes
+      portal_type_class.importFromFilesystemDefinition(property_sheet,
+                                                       attribute_dict)
+
+    for category in getattr(definition_class, '_categories', []):
+      # A category may be a TALES Expression rather than a plain
+      # string
+      portal_type = isinstance(category, Expression) and \
+        'Dynamic Category Property' or 'Category Property'
+
+      portal_type_class = types_tool.getPortalTypeClass(portal_type)
+
+      # Create the new category
+      portal_type_class.importFromFilesystemDefinition(property_sheet,
+                                                       category)
+
+    # Get filesystem Constraint names to be able to map them properly
+    # to ZODB Constraint Portal Types as some filesystem constraint
+    # names are 'NAMEConstraint' or 'NAME'
+    from Products.ERP5Type import Constraint as FilesystemConstraint
+    filesystem_constraint_class_name_list = [
+      class_name for class_name in FilesystemConstraint.__dict__ \
+      if class_name[0] != '_' ]
+
+    # Mapping between the filesystem 'type' field and Portal Types ID
+    portal_type_dict = {}
+
+    for portal_type_id in types_tool.objectIds():
+      if not portal_type_id.endswith(' Constraint'):
+        continue
+
+      constraint_class_name = portal_type_id.replace(' ', '')
+
+      if constraint_class_name not in filesystem_constraint_class_name_list:
+        constraint_class_name = constraint_class_name.replace('Constraint', '')
+
+        if constraint_class_name not in filesystem_constraint_class_name_list:
+          LOG("Tool.PropertySheetTool", WARNING,
+              "PropertySheet %s: No matching Constraint found for Portal '%s'" % \
+              (property_sheet_name, portal_type_id))
+
+          continue
+
+      portal_type_dict[constraint_class_name] = portal_type_id
+
+    portal_type_dict.update(cls._merged_portal_type_dict)
+
+    for constraint in getattr(definition_class, '_constraints', ()):
+      try:
+        portal_type = portal_type_dict[constraint['type']]
+      except KeyError:
+        # TODO: Constraints without Portal Type yet (e.g. Constraints
+        # which have not been migrated yet (within BTs or per-project
+        # Products)) are simply *ignored* for now
+        LOG("Tool.PropertySheetTool", WARNING,
+            "Not migrating constraint %s to portal_property_sheets" % \
+            constraint['type'])
+
+        continue
+
+      portal_type_class = types_tool.getPortalTypeClass(portal_type)
+
+      # Create the new constraint
+      portal_type_class.importFromFilesystemDefinition(property_sheet,
+                                                       constraint)
+
+    return property_sheet

product/ERP5Type/Tool/PropertySheetTool.py

@@ -34,9 +34,9 @@ from Products.ERP5Type.Tool.BaseTool import BaseTool
 from Products.ERP5Type import Permissions
 from Products.ERP5Type.Accessor import Translation
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore.Expression import Expression
+from Products.ERP5Type.Core.PropertySheet import PropertySheet as PropertySheetDocument
 
-from zLOG import LOG, INFO, WARNING
+from zLOG import LOG, INFO
 
 class PropertySheetTool(BaseTool):
   """
@@ -59,114 +59,6 @@ class PropertySheetTool(BaseTool):
             [Translation.TRANSLATION_DOMAIN_CONTENT_TRANSLATION]
             )
 
-  @staticmethod
-  def _guessFilesystemPropertyPortalType(attribute_dict):
-    """
-    Guess the Portal Type of a filesystem-based Property Sheet from
-    the attributes of the given property
-    """
-    for key in attribute_dict:
-      if key.startswith('acqui') or \
-         key in ('alt_accessor_id',
-                 # Specific to 'content' type
-                 'portal_type',
-                 'translation_acquired_property'):
-        return 'Acquired Property'
-
-    return 'Standard Property'
-
-  _merged_portal_type_dict = {
-    'CategoryAcquiredExistence': 'Category Existence Constraint',
-    'CategoryAcquiredMembershipArity': 'Category Membership Arity Constraint'}
-
-  security.declareProtected(Permissions.ModifyPortalContent,
-                            'createPropertySheetFromFilesystemClass')
-  def createPropertySheetFromFilesystemClass(self, klass):
-    """
-    Create a new Property Sheet in portal_property_sheets from a given
-    filesystem-based Property Sheet definition.
-    """
-    new_property_sheet_name = klass.__name__
-
-    new_property_sheet = self.newContent(id=new_property_sheet_name,
-                                         portal_type='Property Sheet')
-
-    types_tool = self.getPortalObject().portal_types
-
-    for attribute_dict in getattr(klass, '_properties', []):
-      # The property could be either a Standard or an Acquired
-      # Property
-      portal_type_class = types_tool.getPortalTypeClass(
-        self._guessFilesystemPropertyPortalType(attribute_dict))
-
-      # Create the new property and set its attributes
-      portal_type_class.importFromFilesystemDefinition(new_property_sheet,
-                                                       attribute_dict)
-
-    for category in getattr(klass, '_categories', []):
-      # A category may be a TALES Expression rather than a plain
-      # string
-      portal_type = isinstance(category, Expression) and \
-        'Dynamic Category Property' or 'Category Property'
-
-      portal_type_class = types_tool.getPortalTypeClass(portal_type)
-
-      # Create the new category
-      portal_type_class.importFromFilesystemDefinition(new_property_sheet,
-                                                       category)
-
-    # Get filesystem Constraint names to be able to map them properly
-    # to ZODB Constraint Portal Types as some filesystem constraint
-    # names are 'NAMEConstraint' or 'NAME'
-    from Products.ERP5Type import Constraint as FilesystemConstraint
-    filesystem_constraint_class_name_list = [
-      class_name for class_name in FilesystemConstraint.__dict__ \
-      if class_name[0] != '_' ]
-
-    # Mapping between the filesystem 'type' field and Portal Types ID
-    portal_type_dict = {}
-
-    for portal_type_id in types_tool.objectIds():
-      if not portal_type_id.endswith(' Constraint'):
-        continue
-
-      constraint_class_name = portal_type_id.replace(' ', '')
-
-      if constraint_class_name not in filesystem_constraint_class_name_list:
-        constraint_class_name = constraint_class_name.replace('Constraint', '')
-
-        if constraint_class_name not in filesystem_constraint_class_name_list:
-          LOG("Tool.PropertySheetTool", WARNING,
-              "PropertySheet %s: No matching Constraint found for Portal '%s'" % \
-              (new_property_sheet_name, portal_type_id))
-
-          continue
-
-      portal_type_dict[constraint_class_name] = portal_type_id
-
-    portal_type_dict.update(self._merged_portal_type_dict)
-
-    for constraint in getattr(klass, '_constraints', ()):
-      try:
-        portal_type = portal_type_dict[constraint['type']]
-      except KeyError:
-        # TODO: Constraints without Portal Type yet (e.g. Constraints
-        # which have not been migrated yet (within BTs or per-project
-        # Products)) are simply *ignored* for now
-        LOG("Tool.PropertySheetTool", WARNING,
-            "Not migrating constraint %s to portal_property_sheets" % \
-            constraint['type'])
-
-        continue
-
-      portal_type_class = types_tool.getPortalTypeClass(portal_type)
-
-      # Create the new constraint
-      portal_type_class.importFromFilesystemDefinition(new_property_sheet,
-                                                       constraint)
-
-    return new_property_sheet
-
   security.declareProtected(Permissions.ManagePortal,
                             'createAllPropertySheetsFromFilesystem')
   def createAllPropertySheetsFromFilesystem(self, erase_existing=False,
@@ -174,8 +66,6 @@ class PropertySheetTool(BaseTool):
     """
     Create Property Sheets in portal_property_sheets from _all_
     filesystem Property Sheets
-
-    XXX: only meaningful for testing?
     """
     from Products.ERP5Type import PropertySheet
 
@@ -184,7 +74,7 @@ class PropertySheetTool(BaseTool):
       if name[0] == '_':
         continue
 
-      if name in self.portal_property_sheets.objectIds():
+      if name in self.objectIds():
         if erase_existing:
           self.portal_property_sheets.deleteContent(name)
           transaction.commit()
@@ -193,7 +83,8 @@ class PropertySheetTool(BaseTool):
 
       LOG("Tool.PropertySheetTool", INFO,
           "Creating %s in portal_property_sheets" % repr(name))
-      self.createPropertySheetFromFilesystemClass(klass)
+
+      PropertySheetDocument.importFromFilesystemDefinition(self, klass)
       transaction.commit()
 
     if REQUEST is not None:

product/ERP5Type/tests/testDynamicClassGeneration.py

@@ -34,6 +34,7 @@ import transaction
 from Products.ERP5Type.dynamic.portal_type_class import synchronizeDynamicModules
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Type.tests.backportUnittest import expectedFailure
+from Products.ERP5Type.Core.PropertySheet import PropertySheet as PropertySheetDocument
 
 from zope.interface import Interface, implementedBy
 
@@ -1230,6 +1231,7 @@ class TestZodbImportFilesystemPropertySheet(ERP5TypeTestCase):
     from Products.ERP5PropertySheetLegacy import PropertySheet
     import os
 
+    property_sheets_tool = self.portal.portal_property_sheets
     property_sheet_legacy_class_dict = {}
     for module in os.listdir(os.path.dirname(PropertySheet.__file__)):
       if module == '__init__.py' or module[-3:] != '.py':
@@ -1250,11 +1252,11 @@ class TestZodbImportFilesystemPropertySheet(ERP5TypeTestCase):
       filesystem_property_sheet.__name__ = "%s_%s" % \
           (self.__class__.__name__, property_sheet_name)
 
-      zodb_property_sheet = portal.createPropertySheetFromFilesystemClass(
-        filesystem_property_sheet)
+      zodb_property_sheet = PropertySheetDocument.importFromFilesystemDefinition(
+        property_sheets_tool, filesystem_property_sheet)
 
       self.assertTrue(filesystem_property_sheet.__name__ in \
-                      self.portal.portal_property_sheets.objectIds())
+                      property_sheets_tool)
 
       zodb_property_tuple, zodb_category_tuple, zodb_constraint_class_tuple = \
           zodb_property_sheet.exportToFilesystemDefinition()