Skip to content

Commit fe21de9

Browse files
berkerpeksagberkerpeksag
committed
Issue python#26687: Use Py_RETURN_NONE macro in sqlite3 module
1 parent 8278d13 commit fe21de9

4 files changed

Lines changed: 16 additions & 32 deletions

File tree

‎Modules/_sqlite/cache.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@ PyObject* pysqlite_cache_display(pysqlite_Cache* self, PyObject* args)
244244
ptr = ptr->next;
245245
}
246246

247-
Py_INCREF(Py_None);
248-
return Py_None;
247+
Py_RETURN_NONE;
249248
}
250249

251250
static PyMethodDef cache_methods[] = {

‎Modules/_sqlite/connection.c‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,7 @@ PyObject* pysqlite_connection_close(pysqlite_Connection* self, PyObject* args)
348348
}
349349
}
350350

351-
Py_INCREF(Py_None);
352-
return Py_None;
351+
Py_RETURN_NONE;
353352
}
354353

355354
/*
@@ -857,8 +856,7 @@ PyObject* pysqlite_connection_create_function(pysqlite_Connection* self, PyObjec
857856
if (PyDict_SetItem(self->function_pinboard, func, Py_None) == -1)
858857
return NULL;
859858

860-
Py_INCREF(Py_None);
861-
return Py_None;
859+
Py_RETURN_NONE;
862860
}
863861
}
864862

@@ -889,8 +887,7 @@ PyObject* pysqlite_connection_create_aggregate(pysqlite_Connection* self, PyObje
889887
if (PyDict_SetItem(self->function_pinboard, aggregate_class, Py_None) == -1)
890888
return NULL;
891889

892-
Py_INCREF(Py_None);
893-
return Py_None;
890+
Py_RETURN_NONE;
894891
}
895892
}
896893

@@ -1025,8 +1022,7 @@ static PyObject* pysqlite_connection_set_authorizer(pysqlite_Connection* self, P
10251022
if (PyDict_SetItem(self->function_pinboard, authorizer_cb, Py_None) == -1)
10261023
return NULL;
10271024

1028-
Py_INCREF(Py_None);
1029-
return Py_None;
1025+
Py_RETURN_NONE;
10301026
}
10311027
}
10321028

@@ -1055,8 +1051,7 @@ static PyObject* pysqlite_connection_set_progress_handler(pysqlite_Connection* s
10551051
return NULL;
10561052
}
10571053

1058-
Py_INCREF(Py_None);
1059-
return Py_None;
1054+
Py_RETURN_NONE;
10601055
}
10611056

10621057
static PyObject* pysqlite_connection_set_trace_callback(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
@@ -1083,8 +1078,7 @@ static PyObject* pysqlite_connection_set_trace_callback(pysqlite_Connection* sel
10831078
sqlite3_trace(self->db, _trace_callback, trace_callback);
10841079
}
10851080

1086-
Py_INCREF(Py_None);
1087-
return Py_None;
1081+
Py_RETURN_NONE;
10881082
}
10891083

10901084
#ifdef HAVE_LOAD_EXTENSION
@@ -1107,8 +1101,7 @@ static PyObject* pysqlite_enable_load_extension(pysqlite_Connection* self, PyObj
11071101
PyErr_SetString(pysqlite_OperationalError, "Error enabling load extension");
11081102
return NULL;
11091103
} else {
1110-
Py_INCREF(Py_None);
1111-
return Py_None;
1104+
Py_RETURN_NONE;
11121105
}
11131106
}
11141107

@@ -1131,8 +1124,7 @@ static PyObject* pysqlite_load_extension(pysqlite_Connection* self, PyObject* ar
11311124
PyErr_SetString(pysqlite_OperationalError, errmsg);
11321125
return NULL;
11331126
} else {
1134-
Py_INCREF(Py_None);
1135-
return Py_None;
1127+
Py_RETURN_NONE;
11361128
}
11371129
}
11381130
#endif

‎Modules/_sqlite/cursor.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,7 @@ PyObject* _pysqlite_build_column_name(const char* colname)
242242
const char* pos;
243243

244244
if (!colname) {
245-
Py_INCREF(Py_None);
246-
return Py_None;
245+
Py_RETURN_NONE;
247246
}
248247

249248
for (pos = colname;; pos++) {
@@ -914,8 +913,7 @@ PyObject* pysqlite_cursor_fetchone(pysqlite_Cursor* self, PyObject* args)
914913

915914
row = pysqlite_cursor_iternext(self);
916915
if (!row && !PyErr_Occurred()) {
917-
Py_INCREF(Py_None);
918-
return Py_None;
916+
Py_RETURN_NONE;
919917
}
920918

921919
return row;
@@ -996,8 +994,7 @@ PyObject* pysqlite_cursor_fetchall(pysqlite_Cursor* self, PyObject* args)
996994
PyObject* pysqlite_noop(pysqlite_Connection* self, PyObject* args)
997995
{
998996
/* don't care, return None */
999-
Py_INCREF(Py_None);
1000-
return Py_None;
997+
Py_RETURN_NONE;
1001998
}
1002999

10031000
PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args)
@@ -1013,8 +1010,7 @@ PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args)
10131010

10141011
self->closed = 1;
10151012

1016-
Py_INCREF(Py_None);
1017-
return Py_None;
1013+
Py_RETURN_NONE;
10181014
}
10191015

10201016
static PyMethodDef cursor_methods[] = {

‎Modules/_sqlite/module.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ static PyObject* module_enable_shared_cache(PyObject* self, PyObject* args, PyOb
139139
PyErr_SetString(pysqlite_OperationalError, "Changing the shared_cache flag failed");
140140
return NULL;
141141
} else {
142-
Py_INCREF(Py_None);
143-
return Py_None;
142+
Py_RETURN_NONE;
144143
}
145144
}
146145

@@ -172,8 +171,7 @@ static PyObject* module_register_adapter(PyObject* self, PyObject* args)
172171
if (rc == -1)
173172
return NULL;
174173

175-
Py_INCREF(Py_None);
176-
return Py_None;
174+
Py_RETURN_NONE;
177175
}
178176

179177
PyDoc_STRVAR(module_register_adapter_doc,
@@ -221,8 +219,7 @@ static PyObject* enable_callback_tracebacks(PyObject* self, PyObject* args)
221219
return NULL;
222220
}
223221

224-
Py_INCREF(Py_None);
225-
return Py_None;
222+
Py_RETURN_NONE;
226223
}
227224

228225
PyDoc_STRVAR(enable_callback_tracebacks_doc,

0 commit comments

Comments
 (0)