[Erp5-report] r38186 yo - /erp5/trunk/products/ERP5/Document/OrderBuilder.py

[nobody at svn.erp5.org]

Author: yo
Date: Wed Sep  8 08:32:21 2010
New Revision: 38186

URL: http://svn.erp5.org?rev=38186&view=rev
Log:
There is no reason to use restrictedTraverse inside an unrestricted method. Rewrite unreadable code.

Modified:
    erp5/trunk/products/ERP5/Document/OrderBuilder.py

Modified: erp5/trunk/products/ERP5/Document/OrderBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderBuilder.py?rev=38186&r1=38185&r2=38186&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderBuilder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OrderBuilder.py [utf8] Wed Sep  8 08:32:21 2010
@@ -331,16 +331,15 @@ class OrderBuilder(XMLObject, Amount, Pr
     portal = self.getPortalObject()
     delivery_module = getattr(portal, self.getDeliveryModule())
     if update:
-      delivery_to_update_list = [portal.restrictedTraverse(relative_url) for \
+      unrestrictedTraverse = portal.unrestrictedTraverse
+      delivery_to_update_list = [unrestrictedTraverse(relative_url) for \
                                  relative_url in delivery_relative_url_list]
       # Deliveries we are trying to update
       delivery_select_method_id = self.getDeliverySelectMethodId()
-      if delivery_select_method_id not in ["", None]:
-        to_update_delivery_sql_list = getattr(self, delivery_select_method_id) \
-                                      (movement_list=movement_list)
-        delivery_to_update_list.extend([sql_delivery.getObject() \
-                                        for sql_delivery \
-                                        in to_update_delivery_sql_list])
+      if delivery_select_method_id:
+        delivery_select_method = getattr(self, delivery_select_method_id)
+        for brain in delivery_select_method(movement_list=movement_list):
+          delivery_to_update_list.append(brain.getObject())
     else:
       delivery_to_update_list = []
     # We do not want to update the same object more than twice in one