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

[nobody at svn.erp5.org]

Author: yo
Date: Wed Sep  8 08:06:20 2010
New Revision: 38185

URL: http://svn.erp5.org?rev=38185&view=rev
Log:
More cleanup.

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=38185&r1=38184&r2=38185&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderBuilder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OrderBuilder.py [utf8] Wed Sep  8 08:06:20 2010
@@ -283,9 +283,9 @@ class OrderBuilder(XMLObject, Amount, Pr
                            divergence_list):
     instance = None
     property_dict = {}
-    if not len(instance_list):
+    if not instance_list:
       for movement_group_node in movement_group_node_list:
-        for k,v in movement_group_node.getGroupEditDict().iteritems():
+        for k, v in movement_group_node.getGroupEditDict().iteritems():
           if k in property_dict:
             raise DuplicatedPropertyDictKeysError(k)
           else:
@@ -297,8 +297,12 @@ class OrderBuilder(XMLObject, Amount, Pr
         current = movement_group_node_list[-1].getMovementList()[0].getDeliveryValue()
         portal = self.getPortalObject()
         while current != portal:
-          if current in instance_list:
-            instance_list.sort(key=lambda x: x != current and 1 or 0)
+          try:
+            instance_list.remove(current)
+          except ValueError:
+            pass
+          else:
+            instance_list.insert(0, current)
             break
           current = current.getParentValue()
       except AttributeError:
@@ -306,7 +310,7 @@ class OrderBuilder(XMLObject, Amount, Pr
       for instance_to_update in instance_list:
         result, property_dict = self._test(
           instance_to_update, movement_group_node_list, divergence_list)
-        if result == True:
+        if result:
           instance = instance_to_update
           break
     return instance, property_dict