[Erp5-report] r23760 - in /erp5/trunk/products/ERP5: Document/ tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 23 14:32:42 CEST 2008
Author: kazuhiko
Date: Tue Sep 23 14:32:40 2008
New Revision: 23760
URL: http://svn.erp5.org?rev=23760&view=rev
Log:
use sort(key=) instead of sort(cmp=) for better performance.
Modified:
erp5/trunk/products/ERP5/Document/AmortisationRule.py
erp5/trunk/products/ERP5/Document/BusinessTemplate.py
erp5/trunk/products/ERP5/Document/Container.py
erp5/trunk/products/ERP5/Document/Image.py
erp5/trunk/products/ERP5/Document/MovementGroup.py
erp5/trunk/products/ERP5/Document/OrderBuilder.py
erp5/trunk/products/ERP5/Document/WebSite.py
erp5/trunk/products/ERP5/tests/testImmobilisation.py
Modified: erp5/trunk/products/ERP5/Document/AmortisationRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AmortisationRule.py?rev=23760&r1=23759&r2=23760&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AmortisationRule.py (original)
+++ erp5/trunk/products/ERP5/Document/AmortisationRule.py Tue Sep 23 14:32:40 2008
@@ -368,7 +368,7 @@
for current_dict in (aggregated_period_dict, calculated_period_dict):
for type_dict in current_dict.values():
for movement_list in type_dict.values():
- movement_list.sort( lambda a,b: cmp(a['stop_date'], b['stop_date']) )
+ movement_list.sort(key=lambda x: x['stop_date'])
matched_dict = self._matchAmortisationPeriods(calculated_period_dict, aggregated_period_dict)
# We can now apply the calculated movements on the applied rule
Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=23760&r1=23759&r2=23760&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py Tue Sep 23 14:32:40 2008
@@ -1256,11 +1256,9 @@
new_selection.append(skin_id)
new_selection.extend(selection)
# sort the layer according to skin priorities
- new_selection.sort(lambda a, b : cmp(
- b in ps.objectIds() and ps[b].getProperty(
- 'business_template_skin_layer_priority', 0) or 0,
- a in ps.objectIds() and ps[a].getProperty(
- 'business_template_skin_layer_priority', 0) or 0))
+ new_selection.sort(
+ key=lambda x: x in ps.objectIds() and -ps[x].getProperty(
+ 'business_template_skin_layer_priority', 0) or 0)
ps.manage_skinLayers(skinpath = tuple(new_selection), skinname = skin_name, add_skin = 1)
# Make sure that skin data is up-to-date (see CMFCore/Skinnable.py).
p.changeSkin(None)
Modified: erp5/trunk/products/ERP5/Document/Container.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Container.py?rev=23760&r1=23759&r2=23760&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Container.py (original)
+++ erp5/trunk/products/ERP5/Document/Container.py Tue Sep 23 14:32:40 2008
@@ -125,11 +125,11 @@
"""
result = ""
container_line_list = list(self.objectValues())
- container_line_list.sort(lambda x, y: cmp(x.getResource(), y.getResource()))
+ container_line_list.sort(key=lambda x: x.getResource())
for container_line in container_line_list:
if container_line.hasCellContent():
container_cell_list = list(container_line.objectValues())
- container_cell_list.sort(lambda x, y: cmp(x.getVariationText(), y.getVariationText()))
+ container_cell_list.sort(key=lambda x: x.getVariationText())
for container_cell in container_cell_list:
result += "%s %s %s\n" % (container_cell.getResource(),
container_cell.getQuantity(),
@@ -137,7 +137,7 @@
else:
result += "%s %s\n" % (container_line.getResource(), container_line.getQuantity())
container_list = list(self.objectValues(spec = self.meta_type))
- container_list.sort(lambda x, y: cmp(x.getContainerText(), y.getContainerText()))
+ container_list.sort(key=lambda x: x.getContainerText())
more_result = ""
for container in container_list:
more_result += container.getContainerText()
Modified: erp5/trunk/products/ERP5/Document/Image.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Image.py?rev=23760&r1=23759&r2=23760&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py (original)
+++ erp5/trunk/products/ERP5/Document/Image.py Tue Sep 23 14:32:40 2008
@@ -266,7 +266,10 @@
if id in id_list:
id_list.remove(id)
# Sort by desired photo surface area
- id_list.sort(lambda x,y,d=self.getSizeFromImageDisplay: cmp(d(x)[0]*d(x)[1], d(y)[0]*d(y)[1]))
+ def getSurfaceArea(img):
+ x, y = self.getSizeFromImageDisplay(img)
+ return x * y
+ id_list.sort(key=getSurfaceArea)
return id_list
security.declareProtected('Access contents information', 'displayLinks')
Modified: erp5/trunk/products/ERP5/Document/MovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/MovementGroup.py?rev=23760&r1=23759&r2=23760&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/MovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/MovementGroup.py Tue Sep 23 14:32:40 2008
@@ -76,6 +76,6 @@
def separate(self, movement_list):
# We sort group of simulation movements by their IDs.
# DO NOT OVERRIDE THIS METHOD. Override _separate() instead.
- return sorted([[sorted(x[0], lambda a,b:cmp(a.getId(), b.getId())), x[1]] \
+ return sorted([[sorted(x[0], key=lambda x: x.getId()), x[1]] \
for x in self._separate(movement_list)],
lambda a,b: cmp(a[0][0].getId(), b[0][0].getId()))
Modified: erp5/trunk/products/ERP5/Document/OrderBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderBuilder.py?rev=23760&r1=23759&r2=23760&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderBuilder.py (original)
+++ erp5/trunk/products/ERP5/Document/OrderBuilder.py Tue Sep 23 14:32:40 2008
@@ -263,8 +263,7 @@
original = None
if original is not None:
original_id = original.getId()
- instance_list.sort(lambda a,b:cmp(b.getId()==original_id,
- a.getId()==original_id))
+ instance_list.sort(key=lambda x: x.getId() != original_id and 1 or 0)
for instance_to_update in instance_list:
result, property_dict = self._test(
instance_to_update, movement_group_list, divergence_list)
Modified: erp5/trunk/products/ERP5/Document/WebSite.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/WebSite.py?rev=23760&r1=23759&r2=23760&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/WebSite.py (original)
+++ erp5/trunk/products/ERP5/Document/WebSite.py Tue Sep 23 14:32:40 2008
@@ -234,6 +234,6 @@
section_list = section_dict.values()
# Sort by Index
- section_list.sort(lambda x,y: cmp(x.getIntIndex(), y.getIntIndex()))
+ section_list.sort(key=lambda x: x.getIntIndex())
return section_list
Modified: erp5/trunk/products/ERP5/tests/testImmobilisation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testImmobilisation.py?rev=23760&r1=23759&r2=23760&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testImmobilisation.py (original)
+++ erp5/trunk/products/ERP5/tests/testImmobilisation.py Tue Sep 23 14:32:40 2008
@@ -2265,7 +2265,7 @@
c_transaction_list = self.getPortal().portal_catalog(portal_type='Amortisation Transaction')
c_transaction_list = [o.getObject() for o in c_transaction_list]
- c_transaction_list.sort(lambda a,b: cmp(a.getStopDate(),b.getStopDate()))
+ c_transaction_list.sort(key=lambda x: x.getStopDate())
self._testAccountingBuild(c_transaction_list, e_transaction_list)
@@ -2298,7 +2298,7 @@
c_transaction_list = self.getPortal().portal_catalog(portal_type='Amortisation Transaction')
c_transaction_list = [o.getObject() for o in c_transaction_list]
- #c_transaction_list.sort(lambda a,b: cmp(a.getStopDate(),b.getStopDate()))
+ #c_transaction_list.sort(key=lambda x: x.getStopDate())
self._testAccountingBuild(c_transaction_list, e_transaction_list)
@@ -2994,9 +2994,9 @@
except:
pass
if type(c_value) == type([]):
- c_value.sort(lambda a,b: cmp(a.getId(), b.getId()))
+ c_value.sort(key=lambda x: x.getId())
if type(e_value) == type([]):
- e_value.sort(lambda a,b: cmp(a.getId(), b.getId()))
+ e_value.sort(key=lambda x: x.getId())
if is_float:
wrong_transaction = (round(c_value,2) != round(e_value,2))
else:
More information about the Erp5-report
mailing list