[3.7] Fix misleading mentions of tp_size in comments. (GH-9136)
Many type object initializations labeled a field "tp_size" in the
comment, but the name of that field is tp_basicsize..
(cherry picked from commit 0e0bc4e221f592f305d335faf5f8046484eb9238)
Co-authored-by: Peter Eisentraut <peter@eisentraut.org>
diff --git a/Modules/_abc.c b/Modules/_abc.c
index ce9140f..9de199f 100644
--- a/Modules/_abc.c
+++ b/Modules/_abc.c
@@ -68,7 +68,7 @@
static PyTypeObject _abc_data_type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"_abc_data", /*tp_name*/
- sizeof(_abc_data), /*tp_size*/
+ sizeof(_abc_data), /*tp_basicsize*/
.tp_dealloc = (destructor)abc_data_dealloc,
.tp_flags = Py_TPFLAGS_DEFAULT,
.tp_alloc = PyType_GenericAlloc,
diff --git a/Modules/_blake2/blake2b_impl.c b/Modules/_blake2/blake2b_impl.c
index f143b5d..31eaf3e 100644
--- a/Modules/_blake2/blake2b_impl.c
+++ b/Modules/_blake2/blake2b_impl.c
@@ -413,7 +413,7 @@
PyTypeObject PyBlake2_BLAKE2bType = {
PyVarObject_HEAD_INIT(NULL, 0)
"_blake2.blake2b", /* tp_name */
- sizeof(BLAKE2bObject), /* tp_size */
+ sizeof(BLAKE2bObject), /* tp_basicsize */
0, /* tp_itemsize */
py_blake2b_dealloc, /* tp_dealloc */
0, /* tp_print */
diff --git a/Modules/_blake2/blake2s_impl.c b/Modules/_blake2/blake2s_impl.c
index 7d366d3..7c7cb4e 100644
--- a/Modules/_blake2/blake2s_impl.c
+++ b/Modules/_blake2/blake2s_impl.c
@@ -413,7 +413,7 @@
PyTypeObject PyBlake2_BLAKE2sType = {
PyVarObject_HEAD_INIT(NULL, 0)
"_blake2.blake2s", /* tp_name */
- sizeof(BLAKE2sObject), /* tp_size */
+ sizeof(BLAKE2sObject), /* tp_basicsize */
0, /* tp_itemsize */
py_blake2s_dealloc, /* tp_dealloc */
0, /* tp_print */
diff --git a/Modules/_queuemodule.c b/Modules/_queuemodule.c
index 0eb9930..2a9406c 100644
--- a/Modules/_queuemodule.c
+++ b/Modules/_queuemodule.c
@@ -309,7 +309,7 @@
static PyTypeObject PySimpleQueueType = {
PyVarObject_HEAD_INIT(NULL, 0)
"_queue.SimpleQueue", /*tp_name*/
- sizeof(simplequeueobject), /*tp_size*/
+ sizeof(simplequeueobject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
(destructor)simplequeue_dealloc, /*tp_dealloc*/
diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c
index f73bc99..d879e92 100644
--- a/Modules/_sha3/sha3module.c
+++ b/Modules/_sha3/sha3module.c
@@ -489,7 +489,7 @@
static PyTypeObject type_obj = { \
PyVarObject_HEAD_INIT(NULL, 0) \
type_name, /* tp_name */ \
- sizeof(SHA3object), /* tp_size */ \
+ sizeof(SHA3object), /* tp_basicsize */ \
0, /* tp_itemsize */ \
/* methods */ \
(destructor)SHA3_dealloc, /* tp_dealloc */ \
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index f594bda..16d3191 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -226,7 +226,7 @@
static PyTypeObject Locktype = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"_thread.lock", /*tp_name*/
- sizeof(lockobject), /*tp_size*/
+ sizeof(lockobject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
(destructor)lock_dealloc, /*tp_dealloc*/
@@ -487,7 +487,7 @@
static PyTypeObject RLocktype = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"_thread.RLock", /*tp_name*/
- sizeof(rlockobject), /*tp_size*/
+ sizeof(rlockobject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
(destructor)rlock_dealloc, /*tp_dealloc*/
diff --git a/Modules/md5module.c b/Modules/md5module.c
index b019f82..c66b273 100644
--- a/Modules/md5module.c
+++ b/Modules/md5module.c
@@ -465,7 +465,7 @@
static PyTypeObject MD5type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_md5.md5", /*tp_name*/
- sizeof(MD5object), /*tp_size*/
+ sizeof(MD5object), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
MD5_dealloc, /*tp_dealloc*/
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index 27030db..ba42f73 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -980,7 +980,7 @@
static PyTypeObject mmap_object_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"mmap.mmap", /* tp_name */
- sizeof(mmap_object), /* tp_size */
+ sizeof(mmap_object), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor) mmap_object_dealloc, /* tp_dealloc */
diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c
index 58ee71f..150a14e 100644
--- a/Modules/ossaudiodev.c
+++ b/Modules/ossaudiodev.c
@@ -964,7 +964,7 @@
static PyTypeObject OSSAudioType = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"ossaudiodev.oss_audio_device", /*tp_name*/
- sizeof(oss_audio_t), /*tp_size*/
+ sizeof(oss_audio_t), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
(destructor)oss_dealloc, /*tp_dealloc*/
@@ -996,7 +996,7 @@
static PyTypeObject OSSMixerType = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"ossaudiodev.oss_mixer_device", /*tp_name*/
- sizeof(oss_mixer_t), /*tp_size*/
+ sizeof(oss_mixer_t), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
(destructor)oss_mixer_dealloc, /*tp_dealloc*/
diff --git a/Modules/sha1module.c b/Modules/sha1module.c
index d39190b..358cd1e 100644
--- a/Modules/sha1module.c
+++ b/Modules/sha1module.c
@@ -442,7 +442,7 @@
static PyTypeObject SHA1type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_sha1.sha1", /*tp_name*/
- sizeof(SHA1object), /*tp_size*/
+ sizeof(SHA1object), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
SHA1_dealloc, /*tp_dealloc*/
diff --git a/Modules/sha256module.c b/Modules/sha256module.c
index e4cb328..3599eaf 100644
--- a/Modules/sha256module.c
+++ b/Modules/sha256module.c
@@ -529,7 +529,7 @@
static PyTypeObject SHA224type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_sha256.sha224", /*tp_name*/
- sizeof(SHAobject), /*tp_size*/
+ sizeof(SHAobject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
SHA_dealloc, /*tp_dealloc*/
@@ -563,7 +563,7 @@
static PyTypeObject SHA256type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_sha256.sha256", /*tp_name*/
- sizeof(SHAobject), /*tp_size*/
+ sizeof(SHAobject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
SHA_dealloc, /*tp_dealloc*/
diff --git a/Modules/sha512module.c b/Modules/sha512module.c
index 5ac2a2a..d8c846a 100644
--- a/Modules/sha512module.c
+++ b/Modules/sha512module.c
@@ -594,7 +594,7 @@
static PyTypeObject SHA384type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_sha512.sha384", /*tp_name*/
- sizeof(SHAobject), /*tp_size*/
+ sizeof(SHAobject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
SHA512_dealloc, /*tp_dealloc*/
@@ -628,7 +628,7 @@
static PyTypeObject SHA512type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_sha512.sha512", /*tp_name*/
- sizeof(SHAobject), /*tp_size*/
+ sizeof(SHAobject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
SHA512_dealloc, /*tp_dealloc*/
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 8fb368e..c4bf081 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -35,7 +35,7 @@
PyTypeObject PyModuleDef_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"moduledef", /* tp_name */
- sizeof(struct PyModuleDef), /* tp_size */
+ sizeof(struct PyModuleDef), /* tp_basicsize */
0, /* tp_itemsize */
};
@@ -789,7 +789,7 @@
PyTypeObject PyModule_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"module", /* tp_name */
- sizeof(PyModuleObject), /* tp_size */
+ sizeof(PyModuleObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)module_dealloc, /* tp_dealloc */
0, /* tp_print */
diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c
index e5698e6..7de102e 100644
--- a/Objects/namespaceobject.c
+++ b/Objects/namespaceobject.c
@@ -201,7 +201,7 @@
PyTypeObject _PyNamespace_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"types.SimpleNamespace", /* tp_name */
- sizeof(_PyNamespaceObject), /* tp_size */
+ sizeof(_PyNamespaceObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)namespace_dealloc, /* tp_dealloc */
0, /* tp_print */