Use a single capsule, don't cleanup default connection twice.

Author: paultiq

_duckdb-stubs/__init__.pyi

@@ -1437,7 +1437,6 @@ __interactive__: bool
 __jupyter__: bool
 __standard_vector_size__: int
 __version__: str
-_clean_default_connection: pytyping.Any  # value = <capsule object>
 apilevel: str
 paramstyle: str
 threadsafety: int

duckdb/__init__.py

@@ -66,7 +66,6 @@
     __interactive__,
     __jupyter__,
     __standard_vector_size__,
-    _clean_default_connection,
     aggregate,
     alias,
     apilevel,
@@ -292,7 +291,6 @@
     "__jupyter__",
     "__standard_vector_size__",
     "__version__",
-    "_clean_default_connection",
     "aggregate",
     "alias",
     "apilevel",

src/duckdb_py/duckdb_python.cpp

@@ -39,7 +39,11 @@ void InitializeModuleState(py::module_ &m) {
 	SetModuleState(state_ptr);
 
 	// https://pybind11.readthedocs.io/en/stable/advanced/misc.html#module-destructors
-	auto capsule = py::capsule(state_ptr, [](void *p) { delete static_cast<DuckDBPyModuleState *>(p); });
+	auto capsule = py::capsule(state_ptr, [](void *p) {
+		auto state = static_cast<DuckDBPyModuleState *>(p);
+		DuckDBPyModuleState::SetGlobalModuleState(nullptr);
+		delete state;
+	});
 	m.attr("__duckdb_state") = capsule;
 }
 
@@ -1133,12 +1137,6 @@ PYBIND11_MODULE(DUCKDB_PYTHON_LIB_NAME, m,
 	    .value("keyword", PySQLTokenType::PY_SQL_TOKEN_KEYWORD)
 	    .value("comment", PySQLTokenType::PY_SQL_TOKEN_COMMENT)
 	    .export_values();
-
-	// we need this because otherwise we try to remove registered_dfs on shutdown when python is already dead
-	auto clean_default_connection = []() {
-		DuckDBPyConnection::Cleanup();
-	};
-	m.add_object("_clean_default_connection", py::capsule(clean_default_connection));
 }
 
 } // namespace duckdb