address review comments

eendebakpt · eendebakpt · commit fa39a8e17c05 · 2022-12-23T12:34:19.000+01:00
diff --git a/Include/internal/pycore_typeobject.h b/Include/internal/pycore_typeobject.h
@@ -75,7 +75,7 @@ extern void _PyStaticType_ClearWeakRefs(PyTypeObject *type);
 extern void _PyStaticType_Dealloc(PyTypeObject *type);
 
 PyObject *
-_Py_type_getattro_impl(PyTypeObject *type, PyObject *name, int *flag);
+_Py_type_getattro_impl(PyTypeObject *type, PyObject *name, int *supress);
 PyObject *
 _Py_type_getattro(PyTypeObject *type, PyObject *name);
 
diff --git a/Objects/object.c b/Objects/object.c
@@ -940,9 +940,9 @@ _PyObject_LookupAttr(PyObject *v, PyObject *name, PyObject **result)
         return 0;
     }
     if (tp->tp_getattro == (getattrofunc)_Py_type_getattro) {
-        int flag = 0;
-        *result = _Py_type_getattro_impl((PyTypeObject*)v, name, &flag);
-        if (flag) {
+        int supress_missing_attribute_exception = 0;
+        *result = _Py_type_getattro_impl((PyTypeObject*)v, name, &supress_missing_attribute_exception);
+        if (supress_missing_attribute_exception) {
             // return 0 without having to clear the exception
             return 0;
         }
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -4811,7 +4811,7 @@ PyTypeObject PyType_Type = {
     0,                                          /* tp_hash */
     (ternaryfunc)type_call,                     /* tp_call */
     0,                                          /* tp_str */
-    (getattrofunc)_Py_type_getattro,                /* tp_getattro */
+    (getattrofunc)_Py_type_getattro,            /* tp_getattro */
     (setattrofunc)type_setattro,                /* tp_setattro */
     0,                                          /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |

Original file line number	Diff line number	Diff line change
`@@ -940,9 +940,9 @@ _PyObject_LookupAttr(PyObject v, PyObject name, PyObject **result)`
`940`	`940`	`return 0;`
`941`	`941`	`}`
`942`	`942`	`if (tp->tp_getattro == (getattrofunc)_Py_type_getattro) {`
`943`		`- int flag = 0;`
`944`		`- result = _Py_type_getattro_impl((PyTypeObject)v, name, &flag);`
`945`		`- if (flag) {`
	`943`	`+ int supress_missing_attribute_exception = 0;`
	`944`	`+ result = _Py_type_getattro_impl((PyTypeObject)v, name, &supress_missing_attribute_exception);`
	`945`	`+ if (supress_missing_attribute_exception) {`
`946`	`946`	`// return 0 without having to clear the exception`
`947`	`947`	`return 0;`
`948`	`948`	`}`