From cb77418ddaaf45aebb672954d87311aac71eb226 Mon Sep 17 00:00:00 2001 From: Gaetan Delannay Date: Tue, 22 Jan 2013 09:12:00 +0100 Subject: [PATCH] [gen] Stop using param 'cmp' in method [].sort (deprecated in Python3). Used para 'key' instead. --- gen/calendar.py | 2 +- gen/wrappers/__init__.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gen/calendar.py b/gen/calendar.py index d842fd6..066ce66 100644 --- a/gen/calendar.py +++ b/gen/calendar.py @@ -302,7 +302,7 @@ class Calendar(Type): singleRes = (date, event) res.append(singleRes) # Sort the result if required - if sorted: res.sort(lambda x,y: cmp(x[0], y[0])) + if sorted: res.sort(key=lambda x: x[0]) # Group events spanned on several days if required if groupSpanned: # Browse events in reverse order and merge them when appropriate diff --git a/gen/wrappers/__init__.py b/gen/wrappers/__init__.py index b40f4fc..6713d9a 100644 --- a/gen/wrappers/__init__.py +++ b/gen/wrappers/__init__.py @@ -177,9 +177,8 @@ class AbstractWrapper(object): refs = getattr(self.o, fieldName, None) if not refs: return tool = self.tool - refs.sort(lambda x,y: cmp(getattr(tool.getObject(x), sortKey), - getattr(tool.getObject(y), sortKey))) - if reverse: refs.reverse() + refs.sort(key=lambda x: getattr(tool.getObject(x), sortKey), + reverse=reverse) def create(self, fieldNameOrClass, noSecurity=False, **kwargs): '''If p_fieldNameOrClass is the name of a field, this method allows to