mpi: Simplify code for comparisons

ChangeLog

@@ -24,6 +24,7 @@ Misc.
 * *: Format Python files with `black`
 * ci: Check that the docs build in CI.
 * ci: Repair test coverage measurements on coveralls.
+* mpi: Simplify code for comparisons.
 
 
 [0.17.1] - 2019-04-16

src/mbedtls/mpi.pyx

@@ -190,13 +190,11 @@ cdef class MPI:
         # Negative values are not supported.
         return self
 
-    def __eq__(self, other):
-        if not all((isinstance(self, numbers.Integral),
-                    isinstance(other, numbers.Integral))):
+    def __eq__(MPI self, other):
+        if not isinstance(other, numbers.Integral):
             return NotImplemented
-        cdef MPI self_ = MPI(self)
         cdef MPI other_ = MPI(other)
-        return mbedtls_mpi_cmp_mpi(&self_._ctx, &other_._ctx) == 0
+        return mbedtls_mpi_cmp_mpi(&self._ctx, &other_._ctx) == 0
 
     def __float__(self):
         return float(long(self))
@@ -239,34 +237,20 @@ cdef class MPI:
             &result._ctx, &self_._ctx, &other_._ctx))
         return result
 
-    def __lt__(self, other):
-        if not all((isinstance(self, numbers.Integral),
-                    isinstance(other, numbers.Integral))):
+    def __lt__(MPI self, other):
+        if not isinstance(other, numbers.Integral):
             return NotImplemented
-        cdef MPI self_ = MPI(self)
         cdef MPI other_ = MPI(other)
-        return mbedtls_mpi_cmp_mpi(&self_._ctx, &other_._ctx) == -1
+        return mbedtls_mpi_cmp_mpi(&self._ctx, &other_._ctx) == -1
 
-    def __le__(self, other):
-        try:
-            other = _mpi.MPI(other)
-        except TypeError:
-            return NotImplemented
-        return any((self < other, self == other))
+    def __le__(MPI self, other):
+        return self < other or self == other
 
-    def __gt__(self, other):
-        try:
-            other = _mpi.MPI(other)
-        except TypeError:
-            return NotImplemented
+    def __gt__(MPI self, other):
         return not self <= other
 
-    def __ge__(self, other):
-        try:
-            other = _mpi.MPI(other)
-        except TypeError:
-            return NotImplemented
-        return any((self > other, self == other))
+    def __ge__(MPI self, other):
+        return self > other or self == other
 
     def __complex__(self):
         return complex(float(self))