bpo-41861: Convert _sqlite3 PrepareProtocolType to heap type (GH-22428)
This commit is contained in:
parent
d332e7b816
commit
cb6db8b6ae
|
@ -56,7 +56,7 @@ pysqlite_microprotocols_add(PyTypeObject *type, PyObject *proto, PyObject *cast)
|
|||
PyObject* key;
|
||||
int rc;
|
||||
|
||||
if (proto == NULL) proto = (PyObject*)&pysqlite_PrepareProtocolType;
|
||||
if (proto == NULL) proto = (PyObject*)pysqlite_PrepareProtocolType;
|
||||
|
||||
key = Py_BuildValue("(OO)", (PyObject*)type, proto);
|
||||
if (!key) {
|
||||
|
@ -152,7 +152,7 @@ PyObject *
|
|||
pysqlite_adapt(pysqlite_Cursor *self, PyObject *args)
|
||||
{
|
||||
PyObject *obj, *alt = NULL;
|
||||
PyObject *proto = (PyObject*)&pysqlite_PrepareProtocolType;
|
||||
PyObject *proto = (PyObject*)pysqlite_PrepareProtocolType;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "O|OO", &obj, &proto, &alt)) return NULL;
|
||||
return pysqlite_microprotocols_adapt(obj, proto, alt);
|
||||
|
|
|
@ -176,7 +176,7 @@ static PyObject* module_register_adapter(PyObject* self, PyObject* args)
|
|||
pysqlite_BaseTypeAdapted = 1;
|
||||
}
|
||||
|
||||
rc = pysqlite_microprotocols_add(type, (PyObject*)&pysqlite_PrepareProtocolType, caster);
|
||||
rc = pysqlite_microprotocols_add(type, (PyObject*)pysqlite_PrepareProtocolType, caster);
|
||||
if (rc == -1)
|
||||
return NULL;
|
||||
|
||||
|
@ -357,7 +357,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
|
|||
(pysqlite_connection_setup_types() < 0) ||
|
||||
(pysqlite_cache_setup_types(module) < 0) ||
|
||||
(pysqlite_statement_setup_types() < 0) ||
|
||||
(pysqlite_prepare_protocol_setup_types() < 0)
|
||||
(pysqlite_prepare_protocol_setup_types(module) < 0)
|
||||
) {
|
||||
Py_XDECREF(module);
|
||||
return NULL;
|
||||
|
@ -365,7 +365,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
|
|||
|
||||
ADD_TYPE(module, pysqlite_ConnectionType);
|
||||
ADD_TYPE(module, pysqlite_CursorType);
|
||||
ADD_TYPE(module, pysqlite_PrepareProtocolType);
|
||||
ADD_TYPE(module, *pysqlite_PrepareProtocolType);
|
||||
ADD_TYPE(module, pysqlite_RowType);
|
||||
|
||||
if (!(dict = PyModule_GetDict(module))) {
|
||||
|
|
|
@ -30,54 +30,33 @@ int pysqlite_prepare_protocol_init(pysqlite_PrepareProtocol* self, PyObject* arg
|
|||
|
||||
void pysqlite_prepare_protocol_dealloc(pysqlite_PrepareProtocol* self)
|
||||
{
|
||||
Py_TYPE(self)->tp_free((PyObject*)self);
|
||||
PyTypeObject *tp = Py_TYPE(self);
|
||||
|
||||
tp->tp_free(self);
|
||||
Py_DECREF(tp);
|
||||
}
|
||||
|
||||
PyTypeObject pysqlite_PrepareProtocolType= {
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
MODULE_NAME ".PrepareProtocol", /* tp_name */
|
||||
sizeof(pysqlite_PrepareProtocol), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
(destructor)pysqlite_prepare_protocol_dealloc, /* tp_dealloc */
|
||||
0, /* tp_vectorcall_offset */
|
||||
0, /* tp_getattr */
|
||||
0, /* tp_setattr */
|
||||
0, /* tp_as_async */
|
||||
0, /* tp_repr */
|
||||
0, /* tp_as_number */
|
||||
0, /* tp_as_sequence */
|
||||
0, /* tp_as_mapping */
|
||||
0, /* tp_hash */
|
||||
0, /* tp_call */
|
||||
0, /* tp_str */
|
||||
0, /* tp_getattro */
|
||||
0, /* tp_setattro */
|
||||
0, /* tp_as_buffer */
|
||||
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
||||
0, /* tp_doc */
|
||||
0, /* tp_traverse */
|
||||
0, /* tp_clear */
|
||||
0, /* tp_richcompare */
|
||||
0, /* tp_weaklistoffset */
|
||||
0, /* tp_iter */
|
||||
0, /* tp_iternext */
|
||||
0, /* tp_methods */
|
||||
0, /* tp_members */
|
||||
0, /* tp_getset */
|
||||
0, /* tp_base */
|
||||
0, /* tp_dict */
|
||||
0, /* tp_descr_get */
|
||||
0, /* tp_descr_set */
|
||||
0, /* tp_dictoffset */
|
||||
(initproc)pysqlite_prepare_protocol_init, /* tp_init */
|
||||
0, /* tp_alloc */
|
||||
0, /* tp_new */
|
||||
0 /* tp_free */
|
||||
static PyType_Slot type_slots[] = {
|
||||
{Py_tp_dealloc, pysqlite_prepare_protocol_dealloc},
|
||||
{Py_tp_new, PyType_GenericNew},
|
||||
{Py_tp_init, pysqlite_prepare_protocol_init},
|
||||
{0, NULL},
|
||||
};
|
||||
|
||||
extern int pysqlite_prepare_protocol_setup_types(void)
|
||||
static PyType_Spec type_spec = {
|
||||
.name = MODULE_NAME ".PrepareProtocol",
|
||||
.basicsize = sizeof(pysqlite_PrepareProtocol),
|
||||
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE,
|
||||
.slots = type_slots,
|
||||
};
|
||||
|
||||
PyTypeObject *pysqlite_PrepareProtocolType = NULL;
|
||||
|
||||
extern int pysqlite_prepare_protocol_setup_types(PyObject *module)
|
||||
{
|
||||
pysqlite_PrepareProtocolType.tp_new = PyType_GenericNew;
|
||||
Py_SET_TYPE(&pysqlite_PrepareProtocolType, &PyType_Type);
|
||||
return PyType_Ready(&pysqlite_PrepareProtocolType);
|
||||
pysqlite_PrepareProtocolType = (PyTypeObject *)PyType_FromModuleAndSpec(module, &type_spec, NULL);
|
||||
if (pysqlite_PrepareProtocolType == NULL) {
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -31,12 +31,12 @@ typedef struct
|
|||
PyObject_HEAD
|
||||
} pysqlite_PrepareProtocol;
|
||||
|
||||
extern PyTypeObject pysqlite_PrepareProtocolType;
|
||||
extern PyTypeObject *pysqlite_PrepareProtocolType;
|
||||
|
||||
int pysqlite_prepare_protocol_init(pysqlite_PrepareProtocol* self, PyObject* args, PyObject* kwargs);
|
||||
void pysqlite_prepare_protocol_dealloc(pysqlite_PrepareProtocol* self);
|
||||
|
||||
int pysqlite_prepare_protocol_setup_types(void);
|
||||
int pysqlite_prepare_protocol_setup_types(PyObject *module);
|
||||
|
||||
#define UNKNOWN (-1)
|
||||
#endif
|
||||
|
|
|
@ -255,7 +255,7 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para
|
|||
if (!_need_adapt(current_param)) {
|
||||
adapted = current_param;
|
||||
} else {
|
||||
adapted = pysqlite_microprotocols_adapt(current_param, (PyObject*)&pysqlite_PrepareProtocolType, current_param);
|
||||
adapted = pysqlite_microprotocols_adapt(current_param, (PyObject*)pysqlite_PrepareProtocolType, current_param);
|
||||
Py_DECREF(current_param);
|
||||
if (!adapted) {
|
||||
return;
|
||||
|
@ -306,7 +306,7 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para
|
|||
if (!_need_adapt(current_param)) {
|
||||
adapted = current_param;
|
||||
} else {
|
||||
adapted = pysqlite_microprotocols_adapt(current_param, (PyObject*)&pysqlite_PrepareProtocolType, current_param);
|
||||
adapted = pysqlite_microprotocols_adapt(current_param, (PyObject*)pysqlite_PrepareProtocolType, current_param);
|
||||
Py_DECREF(current_param);
|
||||
if (!adapted) {
|
||||
return;
|
||||
|
|
Loading…
Reference in New Issue