summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_sqlite/connection.c26
-rw-r--r--Modules/_weakref.c5
2 files changed, 17 insertions, 14 deletions
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index d12d655..967ba28 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -21,6 +21,10 @@
* 3. This notice may not be removed or altered from any source distribution.
*/
+#ifndef Py_BUILD_CORE_BUILTIN
+# define Py_BUILD_CORE_MODULE 1
+#endif
+
#include "module.h"
#include "structmember.h" // PyMemberDef
#include "connection.h"
@@ -29,6 +33,7 @@
#include "blob.h"
#include "prepare_protocol.h"
#include "util.h"
+#include "pycore_weakref.h" // _PyWeakref_IS_DEAD()
#include <stdbool.h>
@@ -969,10 +974,6 @@ error:
static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
{
- PyObject* new_list;
- PyObject* weakref;
- int i;
-
/* we only need to do this once in a while */
if (self->created_cursors++ < 200) {
return;
@@ -980,18 +981,19 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
self->created_cursors = 0;
- new_list = PyList_New(0);
+ PyObject* new_list = PyList_New(0);
if (!new_list) {
return;
}
- for (i = 0; i < PyList_Size(self->cursors); i++) {
- weakref = PyList_GetItem(self->cursors, i);
- if (PyWeakref_GetObject(weakref) != Py_None) {
- if (PyList_Append(new_list, weakref) != 0) {
- Py_DECREF(new_list);
- return;
- }
+ for (Py_ssize_t i = 0; i < PyList_Size(self->cursors); i++) {
+ PyObject* weakref = PyList_GetItem(self->cursors, i);
+ if (_PyWeakref_IS_DEAD(weakref)) {
+ continue;
+ }
+ if (PyList_Append(new_list, weakref) != 0) {
+ Py_DECREF(new_list);
+ return;
}
}
diff --git a/Modules/_weakref.c b/Modules/_weakref.c
index 387b8fa..21ff0e2 100644
--- a/Modules/_weakref.c
+++ b/Modules/_weakref.c
@@ -1,5 +1,6 @@
#include "Python.h"
-#include "pycore_object.h" // _PyObject_GET_WEAKREFS_LISTPTR
+#include "pycore_object.h" // _PyObject_GET_WEAKREFS_LISTPTR
+#include "pycore_weakref.h" // _PyWeakref_IS_DEAD()
#define GET_WEAKREFS_LISTPTR(o) \
@@ -43,7 +44,7 @@ is_dead_weakref(PyObject *value)
PyErr_SetString(PyExc_TypeError, "not a weakref");
return -1;
}
- return PyWeakref_GET_OBJECT(value) == Py_None;
+ return _PyWeakref_IS_DEAD(value);
}
/*[clinic input]