From 444b1cd4bcd23631c9bfda18fb519792289f1666 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 10 Sep 2018 18:46:08 +0200 Subject: [PATCH] [3.6] Fix misleading mentions of tp_size in comments (GH-9093) 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 --- Modules/_blake2/blake2b_impl.c | 2 +- Modules/_blake2/blake2s_impl.c | 2 +- Modules/_sha3/sha3module.c | 2 +- Modules/_threadmodule.c | 4 ++-- Modules/md5module.c | 2 +- Modules/mmapmodule.c | 2 +- Modules/ossaudiodev.c | 4 ++-- Modules/sha1module.c | 2 +- Modules/sha256module.c | 4 ++-- Modules/sha512module.c | 4 ++-- Objects/moduleobject.c | 4 ++-- Objects/namespaceobject.c | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Modules/_blake2/blake2b_impl.c b/Modules/_blake2/blake2b_impl.c index 09b200ebe1726c..9e6f72e67f4949 100644 --- a/Modules/_blake2/blake2b_impl.c +++ b/Modules/_blake2/blake2b_impl.c @@ -423,7 +423,7 @@ py_blake2b_dealloc(PyObject *self) 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 735b6f08deb6f8..0743fdf2084ca5 100644 --- a/Modules/_blake2/blake2s_impl.c +++ b/Modules/_blake2/blake2s_impl.c @@ -423,7 +423,7 @@ py_blake2s_dealloc(PyObject *self) 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/_sha3/sha3module.c b/Modules/_sha3/sha3module.c index 11aaa1f6b0afd9..e8504de16154c7 100644 --- a/Modules/_sha3/sha3module.c +++ b/Modules/_sha3/sha3module.c @@ -505,7 +505,7 @@ static PyGetSetDef SHA3_getseters[] = { 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 47e84b9e916d99..c504b57b064f3b 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -234,7 +234,7 @@ static PyMethodDef lock_methods[] = { 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*/ @@ -495,7 +495,7 @@ static PyMethodDef rlock_methods[] = { 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 fe9da7d3af2d80..01d2118339e3dd 100644 --- a/Modules/md5module.c +++ b/Modules/md5module.c @@ -466,7 +466,7 @@ static PyGetSetDef MD5_getseters[] = { 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 ebef501d674915..721e5ed32ea2f7 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -1008,7 +1008,7 @@ To map anonymous memory, pass -1 as the fileno (both versions)."); 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 5f0505c8a7b4b4..da1d1631451fc7 100644 --- a/Modules/ossaudiodev.c +++ b/Modules/ossaudiodev.c @@ -969,7 +969,7 @@ oss_getattro(oss_audio_t *self, PyObject *nameobj) 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*/ @@ -1001,7 +1001,7 @@ static PyTypeObject OSSAudioType = { 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 d5065ce1349086..cd123586264c8e 100644 --- a/Modules/sha1module.c +++ b/Modules/sha1module.c @@ -443,7 +443,7 @@ static PyGetSetDef SHA1_getseters[] = { 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 8f067f182c7788..70c49b5da2ee7c 100644 --- a/Modules/sha256module.c +++ b/Modules/sha256module.c @@ -530,7 +530,7 @@ static PyMemberDef SHA_members[] = { 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*/ @@ -564,7 +564,7 @@ static PyTypeObject SHA224type = { 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 17775ae57b6cf0..da0cb5775edbe3 100644 --- a/Modules/sha512module.c +++ b/Modules/sha512module.c @@ -599,7 +599,7 @@ static PyMemberDef SHA_members[] = { 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*/ @@ -633,7 +633,7 @@ static PyTypeObject SHA384type = { 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 c5979329647bf4..0fba90c43c144e 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -34,7 +34,7 @@ bad_traverse_test(PyObject *self, void *arg) { 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 */ }; @@ -761,7 +761,7 @@ The name must be a string; the optional doc argument can have any type."); 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 d28c9133b4b700..6307ee0423dc29 100644 --- a/Objects/namespaceobject.c +++ b/Objects/namespaceobject.c @@ -207,7 +207,7 @@ SimpleNamespace(**kwargs)"); 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 */