Changeset 921:11f9fb4fb178 for src/mlx/xplane.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/xplane.py (modified) (3 diffs)

src/mlx/xplane.py

@@ -12 +12 @@
 import codecs
 import math
+from functools import total_ordering
 
 from xplra import XPlane, MultiGetter, MultiSetter, ProtocolException
@@ -148 +149 @@
         return True
 
+@total_ordering
 class PeriodicRequest(object):
     """A periodic request."""
@@ -198 +200 @@
         pass
 
-    def __cmp__(self, other):
-        """Compare two periodic requests. They are ordered by their next
-        firing times."""
-        return cmp(self._nextFire, other._nextFire)
+    def __eq__(self, other):
+        """Equality comparison by the firing times"""
+        return self._nextFire == other._nextFire
+
+    def __ne__(self, other):
+        """Non-equality comparison by the firing times"""
+        return self._nextFire != other._nextFire
+
+    def __lt__(self, other):
+        """Less-than comparison by the firing times"""
+        return self._nextFire < other._nextFire
 
 class PeriodicDataRequest(PeriodicRequest):