reintroduce PyErr constructors and methods (#4475)

* reintroduce `PyErr` constructors and methods * fixup Co-authored-by: Lily Foote <[email protected]> --------- Co-authored-by: Lily Foote <[email protected]>
PyO3 · Aug 23, 2024 · 18bca6e · 18bca6e
1 parent e068a30
commit 18bca6e
Show file tree

Hide file tree

Showing 21 changed files with 232 additions and 146 deletions.
diff --git a/guide/src/python-from-rust/calling-existing-code.md b/guide/src/python-from-rust/calling-existing-code.md
@@ -368,9 +368,9 @@ class House(object):
                     .call_method1(
                         "__exit__",
                         (
-                            e.get_type_bound(py),
-                            e.value_bound(py),
-                            e.traceback_bound(py),
+                            e.get_type(py),
+                            e.value(py),
+                            e.traceback(py),
                         ),
                     )
                     .unwrap();

diff --git a/src/conversions/anyhow.rs b/src/conversions/anyhow.rs
@@ -150,7 +150,7 @@ mod test_anyhow {
             let pyerr = py
                 .run(ffi::c_str!("raise err"), None, Some(&locals))
                 .unwrap_err();
-            assert_eq!(pyerr.value_bound(py).to_string(), expected_contents);
+            assert_eq!(pyerr.value(py).to_string(), expected_contents);
         })
     }
 
@@ -169,7 +169,7 @@ mod test_anyhow {
             let pyerr = py
                 .run(ffi::c_str!("raise err"), None, Some(&locals))
                 .unwrap_err();
-            assert_eq!(pyerr.value_bound(py).to_string(), expected_contents);
+            assert_eq!(pyerr.value(py).to_string(), expected_contents);
         })
     }
 

diff --git a/src/conversions/chrono.rs b/src/conversions/chrono.rs
@@ -52,9 +52,11 @@ use crate::types::{
     timezone_utc, PyDate, PyDateAccess, PyDateTime, PyDelta, PyDeltaAccess, PyTime, PyTimeAccess,
     PyTzInfo, PyTzInfoAccess,
 };
+use crate::{
+    ffi, Bound, FromPyObject, IntoPy, PyAny, PyErr, PyObject, PyResult, Python, ToPyObject,
+};
 #[cfg(Py_LIMITED_API)]
 use crate::{intern, DowncastError};
-use crate::{Bound, FromPyObject, IntoPy, PyAny, PyErr, PyObject, PyResult, Python, ToPyObject};
 use chrono::offset::{FixedOffset, Utc};
 use chrono::{
     DateTime, Datelike, Duration, NaiveDate, NaiveDateTime, NaiveTime, Offset, TimeZone, Timelike,
@@ -701,13 +703,13 @@ fn naive_datetime_to_py_datetime(
 
 fn warn_truncated_leap_second(obj: &Bound<'_, PyAny>) {
     let py = obj.py();
-    if let Err(e) = PyErr::warn_bound(
+    if let Err(e) = PyErr::warn(
         py,
         &py.get_type::<PyUserWarning>(),
-        "ignored leap-second, `datetime` does not support leap-seconds",
+        ffi::c_str!("ignored leap-second, `datetime` does not support leap-seconds"),
         0,
     ) {
-        e.write_unraisable_bound(py, Some(&obj.as_borrowed()))
+        e.write_unraisable(py, Some(&obj.as_borrowed()))
     };
 }
 
@@ -835,7 +837,7 @@ mod tests {
             assert!(result.is_err());
             let res = result.err().unwrap();
             // Also check the error message is what we expect
-            let msg = res.value_bound(py).repr().unwrap().to_string();
+            let msg = res.value(py).repr().unwrap().to_string();
             assert_eq!(msg, "TypeError(\"zoneinfo.ZoneInfo(key='Europe/London') is not a fixed offset timezone\")");
         });
     }
@@ -850,7 +852,7 @@ mod tests {
             // Now test that converting a PyDateTime with tzinfo to a NaiveDateTime fails
             let res: PyResult<NaiveDateTime> = py_datetime.extract();
             assert_eq!(
-                res.unwrap_err().value_bound(py).repr().unwrap().to_string(),
+                res.unwrap_err().value(py).repr().unwrap().to_string(),
                 "TypeError('expected a datetime without tzinfo')"
             );
         });
@@ -865,14 +867,14 @@ mod tests {
             // Now test that converting a PyDateTime with tzinfo to a NaiveDateTime fails
             let res: PyResult<DateTime<Utc>> = py_datetime.extract();
             assert_eq!(
-                res.unwrap_err().value_bound(py).repr().unwrap().to_string(),
+                res.unwrap_err().value(py).repr().unwrap().to_string(),
                 "TypeError('expected a datetime with non-None tzinfo')"
             );
 
             // Now test that converting a PyDateTime with tzinfo to a NaiveDateTime fails
             let res: PyResult<DateTime<FixedOffset>> = py_datetime.extract();
             assert_eq!(
-                res.unwrap_err().value_bound(py).repr().unwrap().to_string(),
+                res.unwrap_err().value(py).repr().unwrap().to_string(),
                 "TypeError('expected a datetime with non-None tzinfo')"
             );
         });

diff --git a/src/conversions/eyre.rs b/src/conversions/eyre.rs
@@ -155,7 +155,7 @@ mod tests {
             let pyerr = py
                 .run(ffi::c_str!("raise err"), None, Some(&locals))
                 .unwrap_err();
-            assert_eq!(pyerr.value_bound(py).to_string(), expected_contents);
+            assert_eq!(pyerr.value(py).to_string(), expected_contents);
         })
     }
 
@@ -174,7 +174,7 @@ mod tests {
             let pyerr = py
                 .run(ffi::c_str!("raise err"), None, Some(&locals))
                 .unwrap_err();
-            assert_eq!(pyerr.value_bound(py).to_string(), expected_contents);
+            assert_eq!(pyerr.value(py).to_string(), expected_contents);
         })
     }
 

diff --git a/src/coroutine.rs b/src/coroutine.rs
@@ -78,7 +78,7 @@ impl Coroutine {
             (Some(exc), Some(cb)) => cb.throw(exc),
             (Some(exc), None) => {
                 self.close();
-                return Err(PyErr::from_value_bound(exc.into_bound(py)));
+                return Err(PyErr::from_value(exc.into_bound(py)));
             }
             (None, _) => {}
         }

diff --git a/src/err/impls.rs b/src/err/impls.rs
@@ -141,8 +141,8 @@ mod tests {
 
                 let py_err_recovered_from_rust_err: PyErr = rust_err_from_py_err.into();
                 assert!(py_err_recovered_from_rust_err
-                    .value_bound(py)
-                    .is(py_error_clone.value_bound(py))); // It should be the same exception
+                    .value(py)
+                    .is(py_error_clone.value(py))); // It should be the same exception
             })
         };