[Python-checkins] [3.6] Fix misleading mentions of tp_size in comments (GH-9137)
Benjamin Peterson
webhook-mailer at python.org
Mon Sep 10 13:23:07 EDT 2018
https://github.com/python/cpython/commit/6a939c8dae225aaf088c8c37de8cc2655c83ee61
commit: 6a939c8dae225aaf088c8c37de8cc2655c83ee61
branch: 3.6
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2018-09-10T10:23:03-07:00
summary:
[3.6] Fix misleading mentions of tp_size in comments (GH-9137)
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 at eisentraut.org>
files:
M Modules/_blake2/blake2b_impl.c
M Modules/_blake2/blake2s_impl.c
M Modules/_sha3/sha3module.c
M Modules/_threadmodule.c
M Modules/md5module.c
M Modules/mmapmodule.c
M Modules/ossaudiodev.c
M Modules/sha1module.c
M Modules/sha256module.c
M Modules/sha512module.c
M Objects/moduleobject.c
M Objects/namespaceobject.c
diff --git a/Modules/_blake2/blake2b_impl.c b/Modules/_blake2/blake2b_impl.c
index 09b200ebe172..9e6f72e67f49 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 735b6f08deb6..0743fdf2084c 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 11aaa1f6b0af..e8504de16154 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 47e84b9e916d..c504b57b064f 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 fe9da7d3af2d..01d2118339e3 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 ebef501d6749..721e5ed32ea2 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 5f0505c8a7b4..da1d1631451f 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 d5065ce13490..cd123586264c 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 8f067f182c77..70c49b5da2ee 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 17775ae57b6c..da0cb5775edb 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 c5979329647b..0fba90c43c14 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 d28c9133b4b7..6307ee0423dc 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 */
More information about the Python-checkins
mailing list