Changeset 921:11f9fb4fb178 for src/mlx/logger.py

Timestamp:

04/27/19 12:06:32 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Fixed ordering for classes that used cmp (re #347).

File:

• src/mlx/logger.py (modified) (3 diffs)

src/mlx/logger.py

@@ -7 +7 @@
 import time
 import bisect
+from functools import total_ordering
 
 #--------------------------------------------------------------------------------------
@@ -34 +35 @@
     increasing IDs."""
 
+    @total_ordering
     class Entry(object):
         """An entry in the log."""
@@ -119 +121 @@
                                 id = self._id)
 
-        def __cmp__(self, other):
-            """Compare two entries
-
-            First their timestamps are compared, and if those are equal, then
-            their IDs."""
-            result = cmp(self._timestamp, other.timestamp)
-            if result==0:
-                result = cmp(self._id, other._id)
-            return result
+        def __eq__(self, other):
+            """Equality comparison"""
+            return self._timestamp == other.timestamp and \
+                self._id == other._id
+
+        def __ne__(self, other):
+            """Non-equality comparison"""
+            return self._timestamp != other.timestamp or \
+                self._id != other._id
+
+        def __lt__(self, other):
+            """Less-than comparison"""
+            return self._timestamp < other.timestamp or \
+                (self._timestamp == other.timestamp and
+                 self._id < other._id)
 
     class Fault(object):