Skip to content

Reset PyErr before throwing #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2025
+8 −0
Merged

Reset PyErr before throwing #69

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4086efe
make sure the PyErr is cleared before we throw a python exception
Tishj Sep 18, 2025
9e00936
Merge branch 'v1.4-andium' into reset_pyerr_before_throwing
evertlammerts Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/duckdb_py/common/exceptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,12 @@ void PyThrowException(ErrorData &error, PyObject *http_exception) {
}
}

static void UnsetPythonException() {
if (PyErr_Occurred()) {
PyErr_Clear();
}
}

/**
* @see https://peps.python.org/pep-0249/#exceptions
*/
Expand Down Expand Up @@ -381,6 +387,7 @@ void RegisterExceptions(const py::module &m) {
}
} catch (const duckdb::Exception &ex) {
duckdb::ErrorData error(ex);
UnsetPythonException();
PyThrowException(error, HTTP_EXCEPTION.ptr());
} catch (const py::builtin_exception &ex) {
// These represent Python exceptions, we don't want to catch these
Expand All @@ -391,6 +398,7 @@ void RegisterExceptions(const py::module &m) {
// we need to pass non-DuckDB exceptions through as-is
throw;
}
UnsetPythonException();
PyThrowException(error, HTTP_EXCEPTION.ptr());
}
});
Expand Down