gh-140025: fix queue.SimpleQueue.__sizeof__() computation

Lib/test/test_queue.py

@@ -1,6 +1,5 @@
 # Some simple queue module tests, plus some failure conditions
 # to ensure the Queue locks remain stable.
-import itertools
 import random
 import threading
 import time
@@ -1017,6 +1016,28 @@ def setUp(self):
         self.type2test = self.queue._PySimpleQueue
         super().setUp()
 
+    def test_sizeof(self):
+        q = self.type2test()
+
+        empty_size = q.__sizeof__()
+        self.assertGreater(empty_size, 0)
+
+        for i in range(8):
+            q.put(object())
+
+        size_after_8 = q.__sizeof__()
+
+        q.put(object())  # Now 9 items
+        size_after_9 = q.__sizeof__()
+        self.assertGreaterEqual(size_after_9, size_after_8)
+
+        large_q = self.type2test()
+        for i in range(1000):
+            large_q.put(object())
+
+        large_size = large_q.__sizeof__()
+        self.assertGreater(large_size, 0)
+
 
 @need_c_queue
 class CSimpleQueueTest(BaseSimpleQueueTest, unittest.TestCase):
@@ -1027,37 +1048,30 @@ def setUp(self):
         self.type2test = self.queue.SimpleQueue
         super().setUp()
 
-    def test_is_default(self):
-        self.assertIs(self.type2test, self.queue.SimpleQueue)
-        self.assertIs(self.type2test, self.queue.SimpleQueue)
+    def test_sizeof(self):
+        q = self.type2test()
 
-    def test_reentrancy(self):
-        # bpo-14976: put() may be called reentrantly in an asynchronous
-        # callback.
-        q = self.q
-        gen = itertools.count()
-        N = 10000
-        results = []
+        empty_size = q.__sizeof__()
+        self.assertGreater(empty_size, 0)
 
-        # This test exploits the fact that __del__ in a reference cycle
-        # can be called any time the GC may run.
+        for i in range(8):
+            q.put(object())
 
-        class Circular(object):
-            def __init__(self):
-                self.circular = self
+        size_after_8 = q.__sizeof__()
 
-            def __del__(self):
-                q.put(next(gen))
+        q.put(object())  # Now 9 items - should trigger ring buffer growth
+        size_after_9 = q.__sizeof__()
+        self.assertGreater(size_after_9, size_after_8)
 
-        while True:
-            o = Circular()
-            q.put(next(gen))
-            del o
-            results.append(q.get())
-            if results[-1] >= N:
-                break
+        large_q = self.type2test()
+        for i in range(1000):
+            large_q.put(object())
+
+        large_size = large_q.__sizeof__()
+
+        self.assertGreater(large_size, empty_size)
 
-        self.assertEqual(results, list(range(N + 1)))
+        self.assertGreater(large_size, empty_size * 2)
 
 
 if __name__ == "__main__":

Misc/NEWS.d/next/Library/2025-10-14-14-07-08.gh-issue-140025.zQ_Fhe.rst

@@ -0,0 +1 @@
+Fix ``queue.SimpleQueue.__sizeof__()`` computation.

Modules/_queuemodule.c

@@ -500,6 +500,20 @@ _queue_SimpleQueue_qsize_impl(simplequeueobject *self)
     return RingBuf_Len(&self->buf);
 }
 
+/*[clinic input]
+@critical_section
+_queue.SimpleQueue.__sizeof__ -> Py_ssize_t
+[clinic start generated code]*/
+
+static Py_ssize_t
+_queue_SimpleQueue___sizeof___impl(simplequeueobject *self)
+/*[clinic end generated code: output=58ce4e3bbc078fd4 input=40a793cdf1c78c30]*/
+{
+    Py_ssize_t size = _PyObject_SIZE(Py_TYPE(self));
+    size += self->buf.items_cap * sizeof(PyObject *);
+    return size;
+}
+
 static int
 queue_traverse(PyObject *m, visitproc visit, void *arg)
 {
@@ -534,6 +548,7 @@ static PyMethodDef simplequeue_methods[] = {
     _QUEUE_SIMPLEQUEUE_PUT_METHODDEF
     _QUEUE_SIMPLEQUEUE_PUT_NOWAIT_METHODDEF
     _QUEUE_SIMPLEQUEUE_QSIZE_METHODDEF
+    _QUEUE_SIMPLEQUEUE___SIZEOF___METHODDEF
     {"__class_getitem__",    Py_GenericAlias,
     METH_O|METH_CLASS,       PyDoc_STR("See PEP 585")},
     {NULL,           NULL}              /* sentinel */