Mercurial Repository: p/roundup/code: roundup/cgi/templating.py comparison

comparison roundup/cgi/templating.py @ 5414:3fa026621f69

Python 3 preparation: comparisons. Python 3 no longer has the cmp function, or cmp= arguments to sorting functions / methods (key= must be used instead), and requires rich comparison methods such as __lt__ to be defined instead of using __cmp__. All of the comparison mechanisms supported in Python 3 are also supported in Python 2. This patch makes the corresponding changes in Roundup to use key functions and rich comparison methods. In the case of the JournalPassword and Permission classes, only __eq__ and __ne__ are defined as I don't see ordered comparisons as useful there (and for Permission, the old __cmp__ function didn't try to provide a valid ordering). In the case of the Date class, I kept the __cmp__ method and implemented the others in terms of it, to avoid excess repetitiveness in duplicating implementation code for all six rich comparison methods. In roundup/admin.py, help_commands_html used operator.attrgetter to produce the second argument of sorted() - which would be reasonable for a key function, but the second argument is the cmp function in Python 2, not a key function (and the key function must be a named argument not a positional argument in Python 3). That function appears to be completely unused, so I expect that code never worked. This patch adds the missing key= to that sorted() call, but it would also be reasonable to remove the unused function completely instead.

author	Joseph Myers <jsm@polyomino.org.uk>
date	Wed, 25 Jul 2018 00:39:37 +0000
parents	3757449e00c4
children	56c9bcdea47f

comparison

equal deleted inserted replaced

-:7a41dd2abbbd
+:3fa026621f69
 if isinstance(prop, klass):
 value = prop.get_default_value()
 l.append(htmlklass(self._client, self._classname, '',
 prop, name, value, self._anonymous))
 if sort:
-l.sort(lambda a,b:cmp(a._name, b._name))
+l.sort(key=lambda a:a._name)
 return l
 def list(self, sort_on=None):
 """ List all items in this class.
 """
 # get the list and sort it nicely
 l = self._klass.list()
-sortfunc = make_sort_function(self._db, self._classname, sort_on)
+keyfunc = make_key_function(self._db, self._classname, sort_on)
-l.sort(sortfunc)
+l.sort(key=keyfunc)
 # check perms
 check = self._client.db.security.hasPermission
 userid = self._client.userid
 if not check('Web Access', userid):
 classname = self.__class__.__name__
 return '<%s(0x%x) %s %r %r>'%(classname, id(self), self._formname,
 self._prop, self._value)
 def __str__(self):
 return self.plain()
-def __cmp__(self, other):
+def __lt__(self, other):
 if isinstance(other, HTMLProperty):
-return cmp(self._value, other._value)
+return self._value < other._value
-return cmp(self._value, other)
+return self._value < other
+def __le__(self, other):
+if isinstance(other, HTMLProperty):
+return self._value <= other._value
+return self._value <= other
+def __eq__(self, other):
+if isinstance(other, HTMLProperty):
+return self._value == other._value
+return self._value == other
+def __ne__(self, other):
+if isinstance(other, HTMLProperty):
+return self._value != other._value
+return self._value != other
+def __gt__(self, other):
+if isinstance(other, HTMLProperty):
+return self._value > other._value
+return self._value > other
+def __ge__(self, other):
+if isinstance(other, HTMLProperty):
+return self._value >= other._value
+return self._value >= other
 def __bool__(self):
 return not not self._value
 # Python 2 compatibility:
 __nonzero__ = __bool__
 def __init__(self, *args, **kwargs):
 HTMLProperty.__init__(self, *args, **kwargs)
 if self._value:
 display_value = lookupIds(self._db, self._prop, self._value,
 fail_ok=1, do_lookup=False)
-sortfun = make_sort_function(self._db, self._prop.classname)
+keyfun = make_key_function(self._db, self._prop.classname)
 # sorting fails if the value contains
 # items not yet stored in the database
 # ignore these errors to preserve user input
 try:
-display_value.sort(sortfun)
+display_value.sort(key=keyfun)
 except:
 pass
 self._value = display_value
 def __len__(self):
 return self.viewableGenerator(l)
 def sorted(self, property):
 """ Return this multilink sorted by the given property """
 value = list(self.__iter__())
-value.sort(lambda a,b:cmp(a[property], b[property]))
+value.sort(key=lambda a:a[property])
 return value
 def __contains__(self, value):
 """ Support the "in" operator. We have to make sure the passed-in
 value is a string first, not a HTMLProperty.
 break
 else:
 propclasses.append((prop, cls))
-def make_sort_function(db, classname, sort_on=None):
+def make_key_function(db, classname, sort_on=None):
-"""Make a sort function for a given class.
+"""Make a sort key function for a given class.
 The list being sorted may contain mixed ids and labels.
 """
 linkcl = db.getclass(classname)
 if sort_on is None:
 sort_on = linkcl.orderprop()
-def sortfunc(a, b):
+def keyfunc(a):
 if num_re.match(a):
 a = linkcl.get(a, sort_on)
-if num_re.match(b):
+return a
-b = linkcl.get(b, sort_on)
+return keyfunc
-return cmp(a, b)
-return sortfunc
 def handleListCGIValue(value):
 """ Value is either a single item or a list of items. Each item has a
 .value that we're actually interested in.
 """

Mercurial > p > roundup > code

comparison roundup/cgi/templating.py @ 5414:3fa026621f69