From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 22 Jul 2013 06:34:32 +0000 (+0200)
Subject: Issue #18488: Fix _pysqlite_final_callback()
X-Git-Tag: v3.4.0a1~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a8573230c0d5b42e3f66ea604fdb86cafeb6366;p=python

Issue #18488: Fix _pysqlite_final_callback()

Restore behaviour of Python 3.3: print the finalizer() error if
sqlite3.enable_callback_tracebacks() has been called, clear the error
otherwise.

But keep (save/restore) also the AttributeError raised in
_pysqlite_step_callback().
---

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index ed4ae1c197..551431c0db 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -718,10 +718,6 @@ void _pysqlite_final_callback(sqlite3_context* context)
 
     function_result = _PyObject_CallMethodId(*aggregate_instance, &PyId_finalize, "");
 
-    /* Restore the exception (if any) of the last call to step(),
-       but clear also the current exception if finalize() failed */
-    PyErr_Restore(exception, value, tb);
-
     Py_DECREF(*aggregate_instance);
 
     ok = 0;
@@ -738,6 +734,10 @@ void _pysqlite_final_callback(sqlite3_context* context)
         _sqlite3_result_error(context, "user-defined aggregate's 'finalize' method raised error", -1);
     }
 
+    /* Restore the exception (if any) of the last call to step(),
+       but clear also the current exception if finalize() failed */
+    PyErr_Restore(exception, value, tb);
+
 error:
 #ifdef WITH_THREAD
     PyGILState_Release(threadstate);