Index: Modules/_sqlite/connection.c =================================================================== --- Modules/_sqlite/connection.c (révision 70631) +++ Modules/_sqlite/connection.c (copie de travail) @@ -169,8 +169,10 @@ self->timeout = timeout; (void)sqlite3_busy_timeout(self->db, (int)(timeout*1000)); +#ifdef WITH_THREAD self->thread_ident = PyThread_get_thread_ident(); self->check_same_thread = check_same_thread; +#endif self->function_pinboard = PyDict_New(); if (!self->function_pinboard) { @@ -585,9 +587,11 @@ PyObject* py_func; PyObject* py_retval = NULL; +#ifdef WITH_THREAD PyGILState_STATE threadstate; threadstate = PyGILState_Ensure(); +#endif py_func = (PyObject*)sqlite3_user_data(context); @@ -609,7 +613,9 @@ _sqlite3_result_error(context, "user-defined function raised exception", -1); } +#ifdef WITH_THREAD PyGILState_Release(threadstate); +#endif } static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_value** params) @@ -620,9 +626,11 @@ PyObject** aggregate_instance; PyObject* stepmethod = NULL; +#ifdef WITH_THREAD PyGILState_STATE threadstate; threadstate = PyGILState_Ensure(); +#endif aggregate_class = (PyObject*)sqlite3_user_data(context); @@ -669,7 +677,9 @@ Py_XDECREF(stepmethod); Py_XDECREF(function_result); +#ifdef WITH_THREAD PyGILState_Release(threadstate); +#endif } void _pysqlite_final_callback(sqlite3_context* context) @@ -678,9 +688,11 @@ PyObject** aggregate_instance; PyObject* aggregate_class; +#ifdef WITH_THREAD PyGILState_STATE threadstate; threadstate = PyGILState_Ensure(); +#endif aggregate_class = (PyObject*)sqlite3_user_data(context); @@ -708,7 +720,9 @@ Py_XDECREF(*aggregate_instance); Py_XDECREF(function_result); +#ifdef WITH_THREAD PyGILState_Release(threadstate); +#endif } void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self) @@ -803,9 +817,11 @@ { PyObject *ret; int rc; +#ifdef WITH_THREAD PyGILState_STATE gilstate; gilstate = PyGILState_Ensure(); +#endif ret = PyObject_CallFunction((PyObject*)user_arg, "issss", action, arg1, arg2, dbname, access_attempt_source); if (!ret) { @@ -825,7 +841,9 @@ Py_DECREF(ret); } +#ifdef WITH_THREAD PyGILState_Release(gilstate); +#endif return rc; } @@ -833,9 +851,11 @@ { int rc; PyObject *ret; +#ifdef WITH_THREAD PyGILState_STATE gilstate; gilstate = PyGILState_Ensure(); +#endif ret = PyObject_CallFunction((PyObject*)user_arg, ""); if (!ret) { @@ -852,7 +872,9 @@ Py_DECREF(ret); } +#ifdef WITH_THREAD PyGILState_Release(gilstate); +#endif return rc; } @@ -907,6 +929,7 @@ int pysqlite_check_thread(pysqlite_Connection* self) { +#ifdef WITH_THREAD if (self->check_same_thread) { if (PyThread_get_thread_ident() != self->thread_ident) { PyErr_Format(pysqlite_ProgrammingError, @@ -917,7 +940,7 @@ } } - +#endif return 1; } @@ -1139,12 +1162,13 @@ PyObject* callback = (PyObject*)context; PyObject* string1 = 0; PyObject* string2 = 0; - PyGILState_STATE gilstate; - PyObject* retval = NULL; int result = 0; +#ifdef WITH_THREAD + PyGILState_STATE gilstate; gilstate = PyGILState_Ensure(); +#endif if (PyErr_Occurred()) { goto finally; @@ -1174,7 +1198,9 @@ Py_XDECREF(string2); Py_XDECREF(retval); +#ifdef WITH_THREAD PyGILState_Release(gilstate); +#endif return result; } Index: Modules/_sqlite/connection.h =================================================================== --- Modules/_sqlite/connection.h (révision 70631) +++ Modules/_sqlite/connection.h (copie de travail) @@ -59,12 +59,14 @@ * freed in connection destructor */ char* begin_statement; +#ifdef WITH_THREAD /* 1 if a check should be performed for each API call if the connection is * used from the same thread it was created in */ int check_same_thread; /* thread identification of the thread the connection was created in */ long thread_ident; +#endif pysqlite_Cache* statement_cache; Index: Modules/_sqlite/module.c =================================================================== --- Modules/_sqlite/module.c (révision 70631) +++ Modules/_sqlite/module.c (copie de travail) @@ -432,6 +432,7 @@ pysqlite_BaseTypeAdapted = 0; +#ifdef WITH_THREAD /* Original comment from _bsddb.c in the Python core. This is also still * needed nowadays for Python 2.3/2.4. * @@ -446,6 +447,7 @@ * (see pybsddb-users mailing list post on 2002-08-07) */ PyEval_InitThreads(); +#endif error: if (PyErr_Occurred())