Return Bound<'py, PyBaseException> from create_normalized_exception

Author: bschoenmaeckers

src/err/err_state.rs

@@ -204,13 +204,6 @@ impl PyErrStateNormalized {
         unsafe { ffi::PyException_SetTraceback(self.pvalue.as_ptr(), tb) };
     }
 
-    #[cfg_attr(not(Py_3_12), allow(unused))]
-    pub(crate) fn set_context(&self, _py: Python<'_>, context: Option<Bound<'_, PyBaseException>>) {
-        let context = context.map(Bound::into_ptr).unwrap_or(std::ptr::null_mut());
-
-        unsafe { ffi::PyException_SetContext(self.pvalue.as_ptr(), context) };
-    }
-
     pub(crate) fn take(py: Python<'_>) -> Option<PyErrStateNormalized> {
         #[cfg(Py_3_12)]
         {
@@ -410,7 +403,7 @@ fn raise_lazy(py: Python<'_>, lazy: Box<PyErrStateLazyFn>) {
         {
             let exc = create_normalized_exception(ptype.bind(py), pvalue.into_bound(py));
 
-            ffi::PyErr_SetRaisedException(exc.pvalue.into_ptr());
+            ffi::PyErr_SetRaisedException(exc.into_ptr());
         }
     }
 }
@@ -419,7 +412,7 @@ fn raise_lazy(py: Python<'_>, lazy: Box<PyErrStateLazyFn>) {
 fn create_normalized_exception<'py>(
     ptype: &Bound<'py, PyAny>,
     mut pvalue: Bound<'py, PyAny>,
-) -> PyErrStateNormalized {
+) -> Bound<'py, PyBaseException> {
     let py = ptype.py();
 
     // 1: check type is a subclass of BaseException
@@ -449,25 +442,12 @@ fn create_normalized_exception<'py>(
 
     match pvalue {
         Ok(pvalue) => {
-            let normalized = PyErrStateNormalized {
-                #[cfg(not(Py_3_12))]
-                ptype,
-                pvalue: pvalue.unbind(),
-                #[cfg(not(Py_3_12))]
-                ptraceback: None,
+            unsafe {
+                ffi::PyException_SetContext(pvalue.as_ptr(), ffi::PyErr_GetHandledException())
             };
-
-            let context = unsafe {
-                ffi::PyErr_GetHandledException()
-                    .assume_owned_or_opt(py)
-                    .map(|err| err.cast_into_unchecked())
-            };
-
-            normalized.set_context(py, context);
-
-            normalized
+            pvalue
         }
-        Err(e) => e.normalized(py).clone_ref(py),
+        Err(e) => e.value(py).clone(),
     }
 }