Since Py_TPFLAGS_HAVE_WEAKREFS is set in Py_TPFLAGS_DEFAULT, it does not

need to be specified in the type structures independently.  The flag
exists only for binary compatibility.

This is a "source cleanliness" issue and introduces no behavioral changes.

diff --git a/Objects/classobject.c b/Objects/classobject.c
index 9f4d1555e99e806053c56f9efc52e7bfe518d4da..2babbfbd63fb02a504e3c264fdca3f71b6ad454d 100644 (file)
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -2103,7 +2103,7 @@ PyTypeObject PyMethod_Type = {
        (getattrofunc)instancemethod_getattro,  /* tp_getattro */
        (setattrofunc)instancemethod_setattro,  /* tp_setattro */
        0,                                      /* tp_as_buffer */
-       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC | Py_TPFLAGS_HAVE_WEAKREFS,
+       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC,     /* tp_flags */
        0,                                      /* tp_doc */
        (traverseproc)instancemethod_traverse,  /* tp_traverse */
        0,                                      /* tp_clear */

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 78c968c2b462a35171c8ab4ff61a877fbea5f28e..09c6cb80217d4fec6fc9bb705326d1d7ef1d64c1 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -320,25 +320,25 @@ PyTypeObject PyFunction_Type = {
        "function",
        sizeof(PyFunctionObject) + PyGC_HEAD_SIZE,
        0,
-       (destructor)func_dealloc, /*tp_dealloc*/
-       0,              /*tp_print*/
-       0, /*tp_getattr*/
-       0, /*tp_setattr*/
-       0, /*tp_compare*/
-       (reprfunc)func_repr, /*tp_repr*/
-       0,              /*tp_as_number*/
-       0,              /*tp_as_sequence*/
-       0,              /*tp_as_mapping*/
-       0,              /*tp_hash*/
-       0,              /*tp_call*/
-       0,              /*tp_str*/
-       (getattrofunc)func_getattro,         /*tp_getattro*/
-       (setattrofunc)func_setattro,         /*tp_setattro*/
-       0,              /* tp_as_buffer */
-       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC | Py_TPFLAGS_HAVE_WEAKREFS,
-       0,              /* tp_doc */
-       (traverseproc)func_traverse,    /* tp_traverse */
-       0,              /* tp_clear */
-       0,              /* tp_richcompare */
+       (destructor)func_dealloc,            /* tp_dealloc */
+       0,                                   /* tp_print */
+       0,                                   /* tp_getattr */
+       0,                                   /* tp_setattr */
+       0,                                   /* tp_compare */
+       (reprfunc)func_repr,                 /* tp_repr */
+       0,                                   /* tp_as_number */
+       0,                                   /* tp_as_sequence */
+       0,                                   /* tp_as_mapping */
+       0,                                   /* tp_hash */
+       0,                                   /* tp_call */
+       0,                                   /* tp_str */
+       (getattrofunc)func_getattro,         /* tp_getattro */
+       (setattrofunc)func_setattro,         /* tp_setattro */
+       0,                                   /* tp_as_buffer */
+       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC,  /* tp_flags */
+       0,                                   /* tp_doc */
+       (traverseproc)func_traverse,         /* tp_traverse */
+       0,                                   /* tp_clear */
+       0,                                   /* tp_richcompare */
        offsetof(PyFunctionObject, func_weakreflist), /* tp_weaklistoffset */
 };