make try_recv throw on closed channel

Author: DenisBiryukov91

src/handlers.rs

@@ -23,7 +23,7 @@ use zenoh::handlers::{CallbackParameter, IntoHandler};
 
 use crate::{
     macros::{import, py_static},
-    utils::{generic, short_type_name, IntoPyErr, IntoPyResult, IntoPython, IntoRust},
+    utils::{generic, short_type_name, IntoPyErr, IntoPython, IntoRust},
     ZError,
 };
 
@@ -283,7 +283,10 @@ fn try_recv<T: IntoPython, E: IntoPyErr + Send>(
     py: Python,
     f: impl FnOnce() -> Result<T, E> + Send,
 ) -> PyResult<PyObject> {
-    Ok(py.allow_threads(f).into_pyres()?.into_pyobject(py))
+    match py.allow_threads(f) {
+        Ok(obj) => Ok(obj.into_pyobject(py)),
+        Err(err) => Err(err.into_pyerr()),
+    }
 }
 
 fn recv<T: IntoPython, E: IntoPyErr + Send>(
@@ -319,7 +322,7 @@ impl<T: IntoPython + CallbackParameter> Receiver for RustHandler<DefaultHandler,
     }
 
     fn try_recv(&self, py: Python) -> PyResult<PyObject> {
-        try_recv(py, || PyResult::Ok(self.handler.try_recv().ok()))
+        try_recv(py, || self.handler.try_recv().map_err(DeadlineError::Error))
     }
 
     fn recv(&self, py: Python) -> PyResult<PyObject> {