[Erp5-report] r42959 arnaud.fontaine - /erp5/trunk/products/ERP5Type/Utils.py

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Thu Feb  3 06:58:58 2011
New Revision: 42959

URL: http://svn.erp5.org?rev=42959&view=rev
Log:
When exporting ZODB Property Sheets to their filesystem definition
(which is in turn given to setDefaultProperties), all properties are
exported so we should check for None rather than checking for the key


Modified:
    erp5/trunk/products/ERP5Type/Utils.py

Modified: erp5/trunk/products/ERP5Type/Utils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Utils.py?rev=42959&r1=42958&r2=42959&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Utils.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Utils.py [utf8] Thu Feb  3 06:58:58 2011
@@ -1601,7 +1601,7 @@ def setDefaultProperties(property_holder
         if not prop.get('base_id', None):
           new_prop['base_id'] = prop['id']
           new_prop['id'] = prop['id'] + '_list'
-      if prop.has_key('acquisition_base_category')\
+      if prop.get('acquisition_base_category') is not None \
               and not prop.get('acquisition_copy_value'):
         # Set acquisition values as read only if no value is copied
         new_prop['mode'] = 'r'
@@ -1676,7 +1676,7 @@ def createDefaultAccessors(property_hold
 
   ######################################################
   # Create Getters
-  elif prop.has_key('acquisition_base_category'):
+  elif prop.get('acquisition_base_category') is not None:
     # Create getters for an acquired property
     # XXXX Missing Boolean accessor
     accessor_args = (
@@ -1754,7 +1754,7 @@ def createDefaultAccessors(property_hold
       if not hasattr(property_holder, accessor_name) or override:
         property_holder.registerAccessor(accessor_name, id, Acquired.ListGetter, accessor_args)
       # AcquiredProperty Getters
-      if prop.has_key('acquired_property_id'):
+      if prop.get('acquired_property_id'):
         for aq_id in prop['acquired_property_id']:
           composed_id = "%s_%s" % (id, aq_id)
           # Getter
@@ -1899,7 +1899,7 @@ def createDefaultAccessors(property_hold
     accessor_name = '_baseGet' + UpperCase(id) + 'ValueList'
     if not hasattr(property_holder, accessor_name) or override:
       property_holder.registerAccessor(accessor_name, id, Content.ValueListGetter, accessor_args)
-    if prop.has_key('acquired_property_id'):
+    if prop.get('acquired_property_id'):
       for aq_id in prop['acquired_property_id']:
         for composed_id in ("%s_%s" % (id, aq_id), "default_%s_%s" % (id, aq_id)) :
           accessor_name = 'get' + UpperCase(composed_id)