comparison roundup/admin.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 4cf48ff01e04
children 118f5ffd194e
comparison
equal deleted inserted replaced
5413:7a41dd2abbbd 5414:3fa026621f69
151 151
152 def help_commands_html(self, indent_re=re.compile(r'^(\s+)\S+')): 152 def help_commands_html(self, indent_re=re.compile(r'^(\s+)\S+')):
153 """ Produce an HTML command list. 153 """ Produce an HTML command list.
154 """ 154 """
155 commands = sorted(iter(self.commands.values()), 155 commands = sorted(iter(self.commands.values()),
156 operator.attrgetter('__name__')) 156 key=operator.attrgetter('__name__'))
157 for command in commands: 157 for command in commands:
158 h = _(command.__doc__).split('\n') 158 h = _(command.__doc__).split('\n')
159 name = command.__name__[3:] 159 name = command.__name__[3:]
160 usage = h[0] 160 usage = h[0]
161 print(""" 161 print("""

Roundup Issue Tracker: http://roundup-tracker.org/