[Erp5-report] r43734 jerome - in /erp5/trunk/products/ERP5: Document/ interfaces/

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Feb 25 13:35:02 2011
New Revision: 43734

URL: http://svn.erp5.org?rev=43734&view=rev
Log:
remove force= argument that does not make any sense now

Modified:
    erp5/trunk/products/ERP5/Document/Delivery.py
    erp5/trunk/products/ERP5/interfaces/expandable.py

Modified: erp5/trunk/products/ERP5/Document/Delivery.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Delivery.py?rev=43734&r1=43733&r2=43734&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Delivery.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Delivery.py [utf8] Fri Feb 25 13:35:02 2011
@@ -690,8 +690,7 @@ class Delivery(XMLObject, Immobilisation
     ##########################################################################
     # Applied Rule stuff
     @UnrestrictedMethod # XXX-JPS What is this ?
-    def updateAppliedRule(self, rule_reference=None, rule_id=None, force=0,
-                          **kw):
+    def updateAppliedRule(self, rule_reference=None, rule_id=None, **kw):
       """
       Create a new Applied Rule if none is related, or call expand
       on the existing one.
@@ -723,9 +722,9 @@ class Delivery(XMLObject, Immobilisation
       else:
         raise ValueError, 'No such rule as %r is found' % rule_reference
 
-      self._createAppliedRule(rule_id, force=force, **kw)
+      self._createAppliedRule(rule_id, **kw)
 
-    def _createAppliedRule(self, rule_id, force=0, activate_kw=None, **kw):
+    def _createAppliedRule(self, rule_id, activate_kw=None, **kw):
       """
         Create a new Applied Rule is none is related, or call expand
         on the existing one.
@@ -768,12 +767,12 @@ class Delivery(XMLObject, Immobilisation
       # We are now certain we have a single applied rule
       # It is time to expand it
       self.activate(activate_kw=activate_kw, **expand_activate_kw).expand(
-          applied_rule_id=my_applied_rule_id, force=force,
+          applied_rule_id=my_applied_rule_id,
           activate_kw=activate_kw, **kw)
 
     security.declareProtected(Permissions.ModifyPortalContent, 'expand')
     @UnrestrictedMethod
-    def expand(self, applied_rule_id=None, force=0, activate_kw=None,**kw):
+    def expand(self, applied_rule_id=None, activate_kw=None,**kw):
       """
         Reexpand applied rule
 
@@ -786,7 +785,7 @@ class Delivery(XMLObject, Immobilisation
         my_applied_rule = self.portal_simulation.get(applied_rule_id, None)
         if my_applied_rule is not None:
           excluded_rule_path_list.append(my_applied_rule.getPath())
-          my_applied_rule.expand(force=force, activate_kw=activate_kw,**kw)
+          my_applied_rule.expand(activate_kw=activate_kw,**kw)
           # once expanded, the applied_rule must be reindexed
           # because some simulation_movement may change even
           # if there are not edited (acquisition)
@@ -806,7 +805,6 @@ class Delivery(XMLObject, Immobilisation
                   (applied_rule_id, self.getId()))
       self.expandRuleRelatedToMovement(
                   excluded_rule_path_list=excluded_rule_path_list,
-                  force=force,
                   activate_kw=activate_kw,
                   **kw)
 

Modified: erp5/trunk/products/ERP5/interfaces/expandable.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/interfaces/expandable.py?rev=43734&r1=43733&r2=43734&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/interfaces/expandable.py [utf8] (original)
+++ erp5/trunk/products/ERP5/interfaces/expandable.py [utf8] Fri Feb 25 13:35:02 2011
@@ -43,7 +43,7 @@ class IExpandable(Interface):
     (which have been previously built).
   """
 
-  def expand(applied_rule_id=None, force=False, activate_kw=None, **kw):
+  def expand(applied_rule_id=None, activate_kw=None, **kw):
     """
       Expand the current Expandable class into the simulation.
       If no applied_rule_id is provided, try first to find 
@@ -53,9 +53,5 @@ class IExpandable(Interface):
                          be provided to reindex the whole 
                          simulation tree from the root applied rule
 
-      force -- (LEGACY) this named parameter is no longer used. It
-               used to be required because of unclear specification
-               of expand stability
-
       activate_kw -- (TO BE EXPLAINED BY KAZ)
     """