[Erp5-report] r23781 - in /erp5/trunk/products: CMFCategory/ ERP5/Document/ ERP5Form/ ERP5S...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 24 11:37:38 CEST 2008
Author: kazuhiko
Date: Wed Sep 24 11:37:33 2008
New Revision: 23781
URL: http://svn.erp5.org?rev=23781&view=rev
Log:
use sort(key=) instead of sort(cmp=) for better performance.
Modified:
erp5/trunk/products/CMFCategory/Renderer.py
erp5/trunk/products/ERP5/Document/Document.py
erp5/trunk/products/ERP5Form/PreferenceTool.py
erp5/trunk/products/ERP5SyncML/Conduit/ERP5ShopOrderConduit.py
erp5/trunk/products/ERP5Type/ERP5Type.py
erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
Modified: erp5/trunk/products/CMFCategory/Renderer.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFCategory/Renderer.py?rev=23781&r1=23780&r2=23781&view=diff
==============================================================================
--- erp5/trunk/products/CMFCategory/Renderer.py (original)
+++ erp5/trunk/products/CMFCategory/Renderer.py Wed Sep 24 11:37:33 2008
@@ -137,7 +137,7 @@
if self.sort_method is not None:
value_list.sort(self.sort_method)
elif self.sort_id is not None:
- value_list.sort(lambda x,y: cmp(x.getProperty(self.sort_id), y.getProperty(self.sort_id)))
+ value_list.sort(key=lambda x: x.getProperty(self.sort_id))
# If base=1 but base_category is None, it is necessary to guess the base category
# by heuristic.
Modified: erp5/trunk/products/ERP5/Document/Document.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Document.py?rev=23781&r1=23780&r2=23781&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Document.py (original)
+++ erp5/trunk/products/ERP5/Document/Document.py Wed Sep 24 11:37:33 2008
@@ -968,7 +968,7 @@
# Select the first one which is not self and which
# shares the same coordinates
document_list = list(document_list)
- document_list.sort(lambda x,y: cmp(x.getId(), y.getId() ))
+ document_list.sort(key=lambda x: x.getId())
#LOG('[DMS] Existing documents for %s' %self.getSourceReference(), INFO, len(document_list))
for o in document_list:
if o.getRelativeUrl() != self.getRelativeUrl() and\
Modified: erp5/trunk/products/ERP5Form/PreferenceTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/PreferenceTool.py?rev=23781&r1=23780&r2=23781&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/PreferenceTool.py (original)
+++ erp5/trunk/products/ERP5Form/PreferenceTool.py Wed Sep 24 11:37:33 2008
@@ -228,11 +228,11 @@
prefs.append(pref)
else :
prefs.append(pref)
- prefs.sort(lambda b, a: cmp(a.getPriority(), b.getPriority()))
+ prefs.sort(key=lambda x: -x.getPriority())
# add system preferences after user preferences
sys_prefs = [x.getObject() for x in self.searchFolder(portal_type='System Preference', **kw) \
if x.getObject().getProperty('preference_state', 'broken') in ('enabled', 'global')]
- sys_prefs.sort(lambda b, a: cmp(a.getPriority(), b.getPriority()))
+ sys_prefs.sort(key=lambda x: -x.getPriority())
return sys_prefs + prefs
security.declareProtected(Permissions.View, 'getActivePreference')
Modified: erp5/trunk/products/ERP5SyncML/Conduit/ERP5ShopOrderConduit.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/Conduit/ERP5ShopOrderConduit.py?rev=23781&r1=23780&r2=23781&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/Conduit/ERP5ShopOrderConduit.py (original)
+++ erp5/trunk/products/ERP5SyncML/Conduit/ERP5ShopOrderConduit.py Wed Sep 24 11:37:33 2008
@@ -639,9 +639,9 @@
erp5_ship_id_word_list = self.str2id(service_id).split("_")
stor_ship_id_word_list = self.str2id(stor_ship_title).split("_")
erp5_ship_title_word_list = self.str2id(erp5_ship_title).split("_")
- erp5_ship_id_word_list.sort(lambda x, y: cmp(str(x), str(y)))
- stor_ship_id_word_list.sort(lambda x, y: cmp(str(x), str(y)))
- erp5_ship_title_word_list.sort(lambda x, y: cmp(str(x), str(y)))
+ erp5_ship_id_word_list.sort(key=lambda x: str(x))
+ stor_ship_id_word_list.sort(key=lambda x: str(x))
+ erp5_ship_title_word_list.sort(key=lambda x: str(x))
if stor_ship_id_word_list in (erp5_ship_id_word_list, erp5_ship_title_word_list):
shipment_id = service_id
LOG("Service found with method 3 ! >>>>>>>>", 0, repr(shipment_id))
Modified: erp5/trunk/products/ERP5Type/ERP5Type.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/ERP5Type.py?rev=23781&r1=23780&r2=23781&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/ERP5Type.py (original)
+++ erp5/trunk/products/ERP5Type/ERP5Type.py Wed Sep 24 11:37:33 2008
@@ -710,7 +710,7 @@
def reorderActions(self, REQUEST=None):
"""Reorder actions according to their priorities."""
new_actions = self._cloneActions()
- new_actions.sort(lambda x,y: cmp(x.getPriority(), y.getPriority()))
+ new_actions.sort(key=lambda x: x.getPriority())
self._actions = tuple( new_actions )
if REQUEST is not None:
Modified: erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SQLCatalog.py?rev=23781&r1=23780&r2=23781&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Wed Sep 24 11:37:33 2008
@@ -551,7 +551,7 @@
if value is not None:
property_list.append((property_id, value))
# Sort for easy diff
- property_list.sort(lambda x, y: cmp(x[0], y[0]))
+ property_list.sort(key=lambda x: x[0])
for property in property_list:
property_id = property[0]
value = property[1]
@@ -576,7 +576,7 @@
filter_definition = self.filter_dict[filter_id]
filter_list.append((filter_id, filter_definition))
# Sort for easy diff
- filter_list.sort(lambda x, y: cmp(x[0], y[0]))
+ filter_list.sort(key=lambda x: x[0])
for filter_item in filter_list:
filter_id = filter_item[0]
filter_def = filter_item[1]
More information about the Erp5-report
mailing list