Use py.NotImplemented() for unsupported cmp ops

Author: GodTamIt

src/document.rs

@@ -4,7 +4,6 @@
 use itertools::Itertools;
 use pyo3::{
     basic::CompareOp,
-    exceptions::PyNotImplementedError,
     prelude::*,
     types::{
         PyAny, PyDateAccess, PyDateTime, PyDict, PyList, PyTimeAccess, PyTuple,
@@ -563,13 +562,16 @@ impl Document {
         self.clone()
     }
 
-    fn __richcmp__(&self, other: &Self, op: CompareOp) -> PyResult<bool> {
+    fn __richcmp__(
+        &self,
+        other: &Self,
+        op: CompareOp,
+        py: Python<'_>,
+    ) -> PyObject {
         match op {
-            CompareOp::Eq => Ok(self == other),
-            CompareOp::Ne => Ok(self != other),
-            _ => Err(PyNotImplementedError::new_err(format!(
-                "{op:?} op is not supported"
-            ))),
+            CompareOp::Eq => (self == other).into_py(py),
+            CompareOp::Ne => (self != other).into_py(py),
+            _ => py.NotImplemented(),
         }
     }
 }

src/facet.rs

@@ -1,7 +1,4 @@
-use pyo3::{
-    basic::CompareOp, exceptions::PyNotImplementedError, prelude::*,
-    types::PyType,
-};
+use pyo3::{basic::CompareOp, prelude::*, types::PyType};
 use tantivy::schema;
 
 /// A Facet represent a point in a given hierarchy.
@@ -71,13 +68,16 @@ impl Facet {
         Ok(format!("Facet({})", self.to_path_str()))
     }
 
-    fn __richcmp__(&self, other: &Self, op: CompareOp) -> PyResult<bool> {
+    fn __richcmp__(
+        &self,
+        other: &Self,
+        op: CompareOp,
+        py: Python<'_>,
+    ) -> PyObject {
         match op {
-            CompareOp::Eq => Ok(self == other),
-            CompareOp::Ne => Ok(self != other),
-            _ => Err(PyNotImplementedError::new_err(format!(
-                "{op:?} op is not supported"
-            ))),
+            CompareOp::Eq => (self == other).into_py(py),
+            CompareOp::Ne => (self != other).into_py(py),
+            _ => py.NotImplemented(),
         }
     }
 }

src/schema.rs

@@ -1,4 +1,4 @@
-use pyo3::{basic::CompareOp, exceptions::PyNotImplementedError, prelude::*};
+use pyo3::{basic::CompareOp, prelude::*};
 use tantivy as tv;
 
 /// Tantivy schema.
@@ -13,13 +13,16 @@ pub(crate) struct Schema {
 
 #[pymethods]
 impl Schema {
-    fn __richcmp__(&self, other: &Self, op: CompareOp) -> PyResult<bool> {
+    fn __richcmp__(
+        &self,
+        other: &Self,
+        op: CompareOp,
+        py: Python<'_>,
+    ) -> PyObject {
         match op {
-            CompareOp::Eq => Ok(self == other),
-            CompareOp::Ne => Ok(self != other),
-            _ => Err(PyNotImplementedError::new_err(format!(
-                "{op:?} op is not supported"
-            ))),
+            CompareOp::Eq => (self == other).into_py(py),
+            CompareOp::Ne => (self != other).into_py(py),
+            _ => py.NotImplemented(),
         }
     }
 }

src/searcher.rs

@@ -1,11 +1,7 @@
 #![allow(clippy::new_ret_no_self)]
 
 use crate::{document::Document, query::Query, to_pyerr};
-use pyo3::{
-    basic::CompareOp,
-    exceptions::{PyNotImplementedError, PyValueError},
-    prelude::*,
-};
+use pyo3::{basic::CompareOp, exceptions::PyValueError, prelude::*};
 use tantivy as tv;
 use tantivy::collector::{Count, MultiCollector, TopDocs};
 
@@ -65,13 +61,16 @@ impl SearchResult {
         }
     }
 
-    fn __richcmp__(&self, other: &Self, op: CompareOp) -> PyResult<bool> {
+    fn __richcmp__(
+        &self,
+        other: &Self,
+        op: CompareOp,
+        py: Python<'_>,
+    ) -> PyObject {
         match op {
-            CompareOp::Eq => Ok(self == other),
-            CompareOp::Ne => Ok(self != other),
-            _ => Err(PyNotImplementedError::new_err(format!(
-                "{op:?} op is not supported"
-            ))),
+            CompareOp::Eq => (self == other).into_py(py),
+            CompareOp::Ne => (self != other).into_py(py),
+            _ => py.NotImplemented(),
         }
     }
 
@@ -231,13 +230,16 @@ impl DocAddress {
         self.doc
     }
 
-    fn __richcmp__(&self, other: &Self, op: CompareOp) -> PyResult<bool> {
+    fn __richcmp__(
+        &self,
+        other: &Self,
+        op: CompareOp,
+        py: Python<'_>,
+    ) -> PyObject {
         match op {
-            CompareOp::Eq => Ok(self == other),
-            CompareOp::Ne => Ok(self != other),
-            _ => Err(PyNotImplementedError::new_err(format!(
-                "{op:?} op is not supported"
-            ))),
+            CompareOp::Eq => (self == other).into_py(py),
+            CompareOp::Ne => (self != other).into_py(py),
+            _ => py.NotImplemented(),
         }
     }
 }