Merge branch 'main' into c-api-pyrun-string-doc

Author: iamrajhans

Doc/library/logging.rst

@@ -592,10 +592,12 @@ subclasses. However, the :meth:`!__init__` method in subclasses needs to call
 
    .. method:: Handler.close()
 
-      Tidy up any resources used by the handler. This version does no output but
-      removes the handler from an internal list of handlers which is closed when
-      :func:`shutdown` is called. Subclasses should ensure that this gets called
-      from overridden :meth:`close` methods.
+      Tidy up any resources used by the handler. This version does no output
+      but removes the handler from an internal map of handlers, which is used
+      for handler lookup by name.
+
+      Subclasses should ensure that this gets called from overridden :meth:`close`
+      methods.
 
 
    .. method:: Handler.handle(record)

Include/internal/pycore_object.h

@@ -121,7 +121,7 @@ PyAPI_DATA(Py_ssize_t) _Py_RefTotal;
 
 extern void _Py_AddRefTotal(PyThreadState *, Py_ssize_t);
 extern PyAPI_FUNC(void) _Py_IncRefTotal(PyThreadState *);
-extern void _Py_DecRefTotal(PyThreadState *);
+extern PyAPI_FUNC(void) _Py_DecRefTotal(PyThreadState *);
 
 #  define _Py_DEC_REFTOTAL(interp) \
     interp->object_state.reftotal--
@@ -710,7 +710,7 @@ _PyObject_SetMaybeWeakref(PyObject *op)
     }
 }
 
-extern int _PyObject_ResurrectEndSlow(PyObject *op);
+extern PyAPI_FUNC(int) _PyObject_ResurrectEndSlow(PyObject *op);
 #endif
 
 // Temporarily resurrects an object during deallocation. The refcount is set

Lib/ensurepip/__init__.py

@@ -10,7 +10,7 @@
 
 
 __all__ = ["version", "bootstrap"]
-_PIP_VERSION = "24.3.1"
+_PIP_VERSION = "25.0.1"
 
 # Directory of system wheel packages. Some Linux distribution packaging
 # policies recommend against bundling dependencies. For example, Fedora

…pip/_bundled/pip-24.3.1-py3-none-any.whl …pip/_bundled/pip-25.0.1-py3-none-any.whlLib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl renamed to Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl renamed to Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl

@@ -2296,6 +2296,22 @@ async def kill_me(loop):
 
         self.assertEqual(self.all_tasks(loop=self.loop), set())
 
+    def test_task_not_crash_without_finalization(self):
+        Task = self.__class__.Task
+
+        class Subclass(Task):
+            def __del__(self):
+                pass
+
+        async def coro():
+            await asyncio.sleep(0.01)
+
+        task = Subclass(coro(), loop = self.loop)
+        task._log_destroy_pending = False
+
+        del task
+
+        support.gc_collect()
 
     @mock.patch('asyncio.base_events.logger')
     def test_tb_logger_not_called_after_cancel(self, m_log):

Lib/test/test_asyncio/test_tasks.py

@@ -58,11 +58,14 @@ def test_null_dlsym(self):
         import subprocess
         import tempfile
 
-        retcode = subprocess.call(["gcc", "--version"],
-                                  stdout=subprocess.DEVNULL,
-                                  stderr=subprocess.DEVNULL)
-        if retcode != 0:
+        try:
+            retcode = subprocess.call(["gcc", "--version"],
+                                      stdout=subprocess.DEVNULL,
+                                      stderr=subprocess.DEVNULL)
+        except OSError:
             self.skipTest("gcc is missing")
+        if retcode != 0:
+            self.skipTest("gcc --version failed")
 
         pipe_r, pipe_w = os.pipe()
         self.addCleanup(os.close, pipe_r)

Lib/test/test_ctypes/test_dlerror.py

@@ -0,0 +1 @@
+Update bundled pip to 25.0.1

Misc/NEWS.d/next/Library/2025-02-09-17-47-01.gh-issue-129583.-130Ys.rst

@@ -2938,15 +2938,6 @@ _asyncio_Task_set_name_impl(TaskObj *self, PyObject *value)
 static void
 TaskObj_finalize(TaskObj *task)
 {
-    asyncio_state *state = get_asyncio_state_by_def((PyObject *)task);
-    // Unregister the task from the linked list of tasks.
-    // Since task is a native task, we directly call the
-    // unregister_task function. Third party event loops
-    // should use the asyncio._unregister_task function.
-    // See https://docs.python.org/3/library/asyncio-extending.html#task-lifetime-support
-
-    unregister_task(state, task);
-
     PyObject *context;
     PyObject *message = NULL;
     PyObject *func;
@@ -3071,8 +3062,15 @@ TaskObj_dealloc(PyObject *self)
 {
     TaskObj *task = (TaskObj *)self;
 
-    if (PyObject_CallFinalizerFromDealloc(self) < 0) {
-        // resurrected.
+    _PyObject_ResurrectStart(self);
+    // Unregister the task here so that even if any subclass of Task
+    // which doesn't end up calling TaskObj_finalize not crashes.
+    asyncio_state *state = get_asyncio_state_by_def(self);
+    unregister_task(state, task);
+
+    PyObject_CallFinalizer(self);
+
+    if (_PyObject_ResurrectEnd(self)) {
         return;
     }
 
@@ -3991,6 +3989,19 @@ static inline int
 add_one_task(asyncio_state *state, PyObject *tasks, PyObject *task, PyObject *loop)
 {
     assert(PySet_CheckExact(tasks));
+    if (Task_CheckExact(state, task)) {
+        int pending = 0;
+        Py_BEGIN_CRITICAL_SECTION(task);
+        pending = ((TaskObj *)task)->task_state == STATE_PENDING && ((TaskObj *)task)->task_loop == loop;
+        Py_END_CRITICAL_SECTION();
+        if (pending) {
+            if (PySet_Add(tasks, task) < 0) {
+                return -1;
+            }
+        }
+        return 0;
+    }
+
     PyObject *done = PyObject_CallMethodNoArgs(task, &_Py_ID(done));
     if (done == NULL) {
         return -1;
@@ -4102,6 +4113,12 @@ _asyncio_all_tasks_impl(PyObject *module, PyObject *loop)
         Py_DECREF(loop);
         return NULL;
     }
+    if (PyList_Extend(tasks, state->non_asyncio_tasks) < 0) {
+        Py_DECREF(tasks);
+        Py_DECREF(loop);
+        return NULL;
+    }
+
     PyInterpreterState *interp = PyInterpreterState_Get();
     // Stop the world and traverse the per-thread linked list
     // of asyncio tasks for every thread, as well as the
@@ -4127,24 +4144,7 @@ _asyncio_all_tasks_impl(PyObject *module, PyObject *loop)
         Py_DECREF(loop);
         return NULL;
     }
-    PyObject *scheduled_iter = PyObject_GetIter(state->non_asyncio_tasks);
-    if (scheduled_iter == NULL) {
-        Py_DECREF(tasks);
-        Py_DECREF(loop);
-        return NULL;
-    }
-    PyObject *item;
-    while ((item = PyIter_Next(scheduled_iter)) != NULL) {
-        if (PyList_Append(tasks, item) < 0) {
-            Py_DECREF(tasks);
-            Py_DECREF(loop);
-            Py_DECREF(item);
-            Py_DECREF(scheduled_iter);
-            return NULL;
-        }
-        Py_DECREF(item);
-    }
-    Py_DECREF(scheduled_iter);
+
     // All the tasks are now in the list, now filter the tasks which are done
     PyObject *res = PySet_New(NULL);
     if (res == NULL) {

Modules/_asynciomodule.c

@@ -64,6 +64,8 @@ typedef struct {
     DBM *di_dbm;
 } dbmobject;
 
+#define dbmobject_CAST(op)  ((dbmobject *)(op))
+
 #include "clinic/_dbmmodule.c.h"
 
 #define check_dbmobject_open(v, err)                                \
@@ -94,15 +96,16 @@ newdbmobject(_dbm_state *state, const char *file, int flags, int mode)
 
 /* Methods */
 static int
-dbm_traverse(dbmobject *dp, visitproc visit, void *arg)
+dbm_traverse(PyObject *dp, visitproc visit, void *arg)
 {
     Py_VISIT(Py_TYPE(dp));
     return 0;
 }
 
 static void
-dbm_dealloc(dbmobject *dp)
+dbm_dealloc(PyObject *self)
 {
+    dbmobject *dp = dbmobject_CAST(self);
     PyObject_GC_UnTrack(dp);
     if (dp->di_dbm) {
         dbm_close(dp->di_dbm);
@@ -113,8 +116,9 @@ dbm_dealloc(dbmobject *dp)
 }
 
 static Py_ssize_t
-dbm_length(dbmobject *dp)
+dbm_length(PyObject *self)
 {
+    dbmobject *dp = dbmobject_CAST(self);
     _dbm_state *state = PyType_GetModuleState(Py_TYPE(dp));
     assert(state != NULL);
     if (dp->di_dbm == NULL) {
@@ -135,8 +139,9 @@ dbm_length(dbmobject *dp)
 }
 
 static int
-dbm_bool(dbmobject *dp)
+dbm_bool(PyObject *self)
 {
+    dbmobject *dp = dbmobject_CAST(self);
     _dbm_state *state = PyType_GetModuleState(Py_TYPE(dp));
     assert(state != NULL);
 
@@ -166,10 +171,11 @@ dbm_bool(dbmobject *dp)
 }
 
 static PyObject *
-dbm_subscript(dbmobject *dp, PyObject *key)
+dbm_subscript(PyObject *self, PyObject *key)
 {
     datum drec, krec;
     Py_ssize_t tmp_size;
+    dbmobject *dp = dbmobject_CAST(self);
     _dbm_state *state = PyType_GetModuleState(Py_TYPE(dp));
     assert(state != NULL);
     if (!PyArg_Parse(key, "s#", &krec.dptr, &tmp_size)) {
@@ -192,10 +198,11 @@ dbm_subscript(dbmobject *dp, PyObject *key)
 }
 
 static int
-dbm_ass_sub(dbmobject *dp, PyObject *v, PyObject *w)
+dbm_ass_sub(PyObject *self, PyObject *v, PyObject *w)
 {
     datum krec, drec;
     Py_ssize_t tmp_size;
+    dbmobject *dp = dbmobject_CAST(self);
 
     if ( !PyArg_Parse(v, "s#", &krec.dptr, &tmp_size) ) {
         PyErr_SetString(PyExc_TypeError,
@@ -305,7 +312,7 @@ _dbm_dbm_keys_impl(dbmobject *self, PyTypeObject *cls)
 static int
 dbm_contains(PyObject *self, PyObject *arg)
 {
-    dbmobject *dp = (dbmobject *)self;
+    dbmobject *dp = dbmobject_CAST(self);
     datum key, val;
     Py_ssize_t size;
 
@@ -452,15 +459,16 @@ _dbm_dbm_clear_impl(dbmobject *self, PyTypeObject *cls)
 }
 
 static PyObject *
-dbm__enter__(PyObject *self, PyObject *args)
+dbm__enter__(PyObject *self, PyObject *Py_UNUSED(dummy))
 {
     return Py_NewRef(self);
 }
 
 static PyObject *
-dbm__exit__(PyObject *self, PyObject *args)
+dbm__exit__(PyObject *self, PyObject *Py_UNUSED(args))
 {
-    return _dbm_dbm_close_impl((dbmobject *)self);
+    dbmobject *dp = dbmobject_CAST(self);
+    return _dbm_dbm_close_impl(dp);
 }
 
 static PyMethodDef dbm_methods[] = {
@@ -610,7 +618,7 @@ _dbm_module_clear(PyObject *module)
 static void
 _dbm_module_free(void *module)
 {
-    _dbm_module_clear((PyObject *)module);
+    (void)_dbm_module_clear((PyObject *)module);
 }
 
 static PyModuleDef_Slot _dbmmodule_slots[] = {