[Erp5-report] r44635 nicolas - in /erp5/trunk/products/ERP5Type: Core/Folder.py ERP5Type.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Mar 25 17:23:04 2011
New Revision: 44635

URL: http://svn.erp5.org?rev=44635&view=rev
Log:
Optimize code

Modified:
    erp5/trunk/products/ERP5Type/Core/Folder.py
    erp5/trunk/products/ERP5Type/ERP5Type.py

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=44635&r1=44634&r2=44635&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py [utf8] Fri Mar 25 17:23:04 2011
@@ -95,8 +95,6 @@ def dummyFilter(object,REQUEST=None):
 def dummyTestAfter(object,REQUEST=None):
   return []
 
-_MARKER = object()
-
 class FolderMixIn(ExtensionClass.Base):
   """A mixin class for folder operations, add content, delete content etc.
   """
@@ -116,17 +114,11 @@ class FolderMixIn(ExtensionClass.Base):
   def newContent(self, id=None, portal_type=None, id_group=None,
           default=None, method=None, container=None, created_by_builder=0,
           activate_kw=None, is_indexable=None, temp_object=0, reindex_kw=None,
-          compute_local_role=_MARKER, notify_workflow=True,  **kw):
+          compute_local_role=None, notify_workflow=True,  **kw):
     """Creates a new content.
     This method is public, since TypeInformation.constructInstance will perform
     the security check.
     """
-    if compute_local_role is _MARKER:
-      # If temp object, set to False
-      if temp_object:
-        compute_local_role = False
-      else:
-        compute_local_role = True
     pt = self._getTypesTool()
     if container is None:
       container = self

Modified: erp5/trunk/products/ERP5Type/ERP5Type.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/ERP5Type.py?rev=44635&r1=44634&r2=44635&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/ERP5Type.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/ERP5Type.py [utf8] Fri Mar 25 17:23:04 2011
@@ -195,8 +195,6 @@ class LocalRoleAssignorMixIn(object):
       role.uid = None
       return role
 
-_MARKER = object()
-
 class ERP5TypeInformation(XMLObject,
                           FactoryTypeInformation,
                           LocalRoleAssignorMixIn,
@@ -352,7 +350,7 @@ class ERP5TypeInformation(XMLObject,
 
     security.declarePublic('constructInstance')
     def constructInstance(self, container, id, created_by_builder=0,
-                          temp_object=0, compute_local_role=_MARKER,
+                          temp_object=0, compute_local_role=None,
                           notify_workflow=True, *args, **kw ):
       """
       Build a "bare" instance of the appropriate type in
@@ -360,12 +358,9 @@ class ERP5TypeInformation(XMLObject,
       Call the init_script for the portal_type.
       Returns the object.
       """
-      if compute_local_role is _MARKER:
+      if compute_local_role is None:
         # If temp object, set to False
-        if temp_object:
-          compute_local_role = False
-        else:
-          compute_local_role = True
+        compute_local_role = not temp_object
       if not temp_object and not self.isConstructionAllowed(container):
         raise AccessControl_Unauthorized('Cannot create %s' % self.getId())