[Erp5-report] r39870 nicolas.dumazet - /erp5/trunk/products/ERP5Type/Utils.py

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Thu Nov  4 06:11:40 2010
New Revision: 39870

URL: http://svn.erp5.org?rev=39870&view=rev
Log:
Code simplification

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=39870&r1=39869&r2=39870&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Utils.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Utils.py [utf8] Thu Nov  4 06:11:40 2010
@@ -842,21 +842,22 @@ def writeLocalDocument(class_id, text, c
 def setDefaultClassProperties(property_holder):
   """Initialize default properties for ERP5Type Documents.
   """
-  if not property_holder.__dict__.has_key('isPortalContent'):
+  pdict = property_holder.__dict__
+  if not 'isPortalContent' in pdict:
     property_holder.isPortalContent = PropertyConstantGetter('isPortalContent',
                                                      value=True)
-  if not property_holder.__dict__.has_key('isRADContent'):
+  if not 'isRADContent' in pdict:
     property_holder.isRADContent = 1
-  if not property_holder.__dict__.has_key('add_permission'):
+  if not 'add_permission' in pdict:
     property_holder.add_permission = Permissions.AddPortalContent
-  if not property_holder.__dict__.has_key('__implements__'):
+  if not '__implements__' in pdict:
     property_holder.__implements__ = ()
-  if not property_holder.__dict__.has_key('property_sheets'):
+  if not 'property_sheets' in pdict:
     property_holder.property_sheets = ()
   # Add default factory type information
-  if not property_holder.__dict__.has_key('factory_type_information') and \
-         property_holder.__dict__.has_key('meta_type') and \
-         property_holder.__dict__.has_key('portal_type'):
+  if not 'factory_type_information' in pdict and \
+         'meta_type' in pdict and 'portal_type' in pdict:
+    name = property_holder.__name__
     property_holder.factory_type_information = \
       {    'id'             : property_holder.portal_type
          , 'meta_type'      : property_holder.meta_type
@@ -864,13 +865,13 @@ def setDefaultClassProperties(property_h
                                 "Type generated by ERPType")
          , 'icon'           : 'document_icon.gif'
          , 'product'        : 'ERP5Type'
-         , 'factory'        : 'add%s' % property_holder.__name__
-         , 'immediate_view' : '%s_view' % property_holder.__name__
+         , 'factory'        : 'add%s' % name
+         , 'immediate_view' : '%s_view' % name
          , 'actions'        :
         ( { 'id'            : 'view'
           , 'name'          : 'View'
           , 'category'      : 'object_view'
-          , 'action'        : '%s_view' % property_holder.__name__
+          , 'action'        : '%s_view' % name
           , 'permissions'   : ( Permissions.View, )
           },
         )