use PyErr_Clear

pydantic · Jan 15, 2024 · f997f9a · f997f9a
1 parent b81ae9f
commit f997f9a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,7 +57,6 @@ extension-module = ["pyo3/extension-module"]
 lto = "fat"
 codegen-units = 1
 strip = true
-#debug = true
 
 [profile.bench]
 debug = true

diff --git a/src/tools.rs b/src/tools.rs
@@ -105,7 +105,7 @@ pub fn safe_repr(v: &PyAny) -> Cow<str> {
 pub fn extract_i64(obj: &PyAny) -> Option<i64> {
     let val = unsafe { ffi::PyLong_AsLong(obj.as_ptr()) };
     if val == -1 && PyErr::occurred(obj.py()) {
-        _take_err(obj.py());
+        unsafe { ffi::PyErr_Clear() };
         None
     } else {
         Some(val)
@@ -120,18 +120,3 @@ pub fn extract_i64(v: &PyAny) -> Option<i64> {
         None
     }
 }
-
-#[cfg(not(Py_3_12))]
-fn _take_err(_: Python) {
-    let mut ptype: *mut ffi::PyObject = std::ptr::null_mut();
-    let mut pvalue: *mut ffi::PyObject = std::ptr::null_mut();
-    let mut ptraceback: *mut ffi::PyObject = std::ptr::null_mut();
-    unsafe { ffi::PyErr_Fetch(&mut ptype, &mut pvalue, &mut ptraceback) };
-}
-
-#[cfg(Py_3_12)]
-fn _take_err(_: Python) {
-    unsafe {
-        ffi::PyErr_GetRaisedException();
-    }
-}