[Erp5-report] r43233 arnaud.fontaine - /erp5/trunk/products/ERP5Type/Core/

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Wed Feb  9 12:19:46 2011
New Revision: 43233

URL: http://svn.erp5.org?rev=43233&view=rev
Log:
Rename _convertValueToTalesExpression to _getExpressionFromString in
StandardProperty and AcquiredProperty documents

Modified:
    erp5/trunk/products/ERP5Type/Core/AcquiredProperty.py
    erp5/trunk/products/ERP5Type/Core/StandardProperty.py

Modified: erp5/trunk/products/ERP5Type/Core/AcquiredProperty.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/AcquiredProperty.py?rev=43233&r1=43232&r2=43233&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/AcquiredProperty.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/AcquiredProperty.py [utf8] Wed Feb  9 12:19:46 2011
@@ -130,11 +130,10 @@ class AcquiredProperty(StandardProperty)
     filesystem_property_dict = \
         StandardProperty.exportToFilesystemDefinition(self)
 
-    acquisition_portal_type_value = self._convertValueToTalesExpression(
+    acquisition_portal_type_value = self._getExpressionFromString(
       self.getAcquisitionPortalType())
 
-    portal_type_value = self._convertValueToTalesExpression(
-      self.getContentPortalType())
+    portal_type_value = self._getExpressionFromString(self.getContentPortalType())
 
     filesystem_property_dict.update(
       {'acquisition_base_category': self.getAcquisitionBaseCategoryList(),

Modified: erp5/trunk/products/ERP5Type/Core/StandardProperty.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/StandardProperty.py?rev=43233&r1=43232&r2=43233&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/StandardProperty.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/StandardProperty.py [utf8] Wed Feb  9 12:19:46 2011
@@ -114,15 +114,14 @@ class StandardProperty(XMLObject):
                                     'string')
 
   @staticmethod
-  def _convertValueToTalesExpression(value):
+  def _getExpressionFromString(expression_string):
     """
-    Convert a string value to a TALES expression for attributes listed
-    in '_expression_attribute_tuple'
+    Get a TALES Expression instance from a string value
     """
-    if value is None:
+    if expression_string is None:
       return None
 
-    return Expression(value)
+    return Expression(expression_string)
 
   security.declareProtected(Permissions.AccessContentsInformation,
                             'exportToFilesystemDefinition')
@@ -130,8 +129,7 @@ class StandardProperty(XMLObject):
     """
     Return the filesystem definition of this ZODB property
     """
-    property_default_value = self._convertValueToTalesExpression(
-      self.getPropertyDefault())
+    property_default_value = self._getExpressionFromString(self.getPropertyDefault())
 
     return {'id': self.getReference(),
             'description': self.getDescription(),