diff roundup/password.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 a391a071d045
children 2d6a92c3e212
line wrap: on
line diff
--- a/roundup/password.py	Wed Jul 25 00:37:54 2018 +0000
+++ b/roundup/password.py	Wed Jul 25 00:39:37 2018 +0000
@@ -223,19 +223,22 @@
 
     __str__ = dummystr
 
-    def __cmp__(self, other):
+    def __eq__(self, other):
         """Compare this password against another password."""
         # check to see if we're comparing instances
         if isinstance(other, self.__class__):
             if self.scheme != other.scheme:
-                return cmp(self.scheme, other.scheme)
-            return cmp(self.password, other.password)
+                return False
+            return self.password == other.password
 
         # assume password is plaintext
         if self.password is None:
             raise ValueError('Password not set')
-        return cmp(self.password, encodePassword(other, self.scheme,
-            self.password or None))
+        return self.password == encodePassword(other, self.scheme,
+            self.password or None)
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
 
 class Password(JournalPassword):
     """The class encapsulates a Password property type value in the database.

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