Don't repeat the cmp function

ros · Jun 24, 2016 · 085e265 · 085e265 · islers · Oct 18, 2016
1 parent 18620c1
commit 085e265
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/src/genpy/rostime.py b/src/genpy/rostime.py
@@ -181,12 +181,8 @@ def __ne__(self, other):
     def __cmp__(self, other):
         if not isinstance(other, TVal):
             raise TypeError("Cannot compare to non-TVal")
-        nanos = self.to_nsec() - other.to_nsec()
-        if nanos > 0:
-            return 1
-        if nanos == 0:
-            return 0
-        return -1
+        return cmp(self.to_nsec(), other.to_nsec())
+
     def __eq__(self, other):
         if not isinstance(other, TVal):
             return False
@@ -266,12 +262,7 @@ def __cmp__(self, other):
         """
         if not isinstance(other, Time):
             raise TypeError("cannot compare to non-Time")
-        nanos = self.to_nsec() - other.to_nsec()
-        if nanos > 0:
-            return 1
-        if nanos == 0:
-            return 0
-        return -1
+        return cmp(self.to_nsec(), other.to_nsec())
 
     def __eq__(self, other):
         """
@@ -414,12 +405,7 @@ def __truediv__(self, val):
     def __cmp__(self, other):
         if not isinstance(other, Duration):
             raise TypeError("Cannot compare to non-Duration")
-        nanos = self.to_nsec() - other.to_nsec()
-        if nanos > 0:
-            return 1
-        if nanos == 0:
-            return 0
-        return -1
+        return cmp(self.to_nsec(), other.to_nsec())
 
     def __eq__(self, other):
         if not isinstance(other, Duration):