bpo-33738: Address review comments in GH #7477 (GH-7585)

ctismer · ned-deily · commit 8398713cea0e · 2018-06-10T18:48:28.000-04:00
diff --git a/Include/abstract.h b/Include/abstract.h
@@ -598,7 +598,7 @@ PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *);
     ((obj)->ob_type->tp_iternext != NULL && \
      (obj)->ob_type->tp_iternext != &_PyObject_NextNotImplemented)
 #else
-PyAPI_FUNC(int) PyIter_Check(PyObject*);
+PyAPI_FUNC(int) PyIter_Check(PyObject *);
 #endif
 
 /* Takes an iterator object and calls its tp_iternext slot,
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
@@ -142,9 +142,9 @@ PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
 
 #ifndef Py_LIMITED_API
 #define PyExceptionClass_Name(x) \
-     ((char *)(((PyTypeObject*)(x))->tp_name))
+     ((char *)(((PyTypeObject *)(x))->tp_name))
 #else
-     PyAPI_FUNC(char *) PyExceptionClass_Name(PyObject*);
+     PyAPI_FUNC(const char *) PyExceptionClass_Name(PyObject *);
 #endif
 
 #define PyExceptionInstance_Class(x) ((PyObject*)((x)->ob_type))
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-06-07-18-34-19.bpo-33738.ODZS7a.rst b/Misc/NEWS.d/next/Core and Builtins/2018-06-07-18-34-19.bpo-33738.ODZS7a.rst
@@ -1,3 +1,4 @@
 Seven macro incompatibilities with the Limited API were fixed, and the
 macros PyIter_Check, PyIndex_Check and PyExceptionClass_Name were added as
-functions. A script for automatic macro checks was added.
+functions. The return type of PyExceptionClass_Name is "const char \*".
+A script for automatic macro checks was added.
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -1245,6 +1245,7 @@ PyNumber_Absolute(PyObject *o)
 }
 
 #undef PyIndex_Check
+
 int
 PyIndex_Check(PyObject *obj)
 {
@@ -2544,6 +2545,7 @@ PyObject_GetIter(PyObject *o)
 }
 
 #undef PyIter_Check
+
 int PyIter_Check(PyObject *obj)
 {
     return obj->ob_type->tp_iternext != NULL &&
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -343,6 +343,7 @@ PyException_SetContext(PyObject *self, PyObject *context)
 }
 
 #undef PyExceptionClass_Name
+
 char *
 PyExceptionClass_Name(PyObject *ob)
 {

Original file line number	Diff line number	Diff line change
`@@ -1245,6 +1245,7 @@ PyNumber_Absolute(PyObject *o)`
`1245`	`1245`	`}`
`1246`	`1246`
`1247`	`1247`	`#undef PyIndex_Check`
	`1248`	`+`
`1248`	`1249`	`int`
`1249`	`1250`	`PyIndex_Check(PyObject *obj)`
`1250`	`1251`	`{`
`@@ -2544,6 +2545,7 @@ PyObject_GetIter(PyObject *o)`
`2544`	`2545`	`}`
`2545`	`2546`
`2546`	`2547`	`#undef PyIter_Check`
	`2548`	`+`
`2547`	`2549`	`int PyIter_Check(PyObject *obj)`
`2548`	`2550`	`{`
`2549`	`2551`	`return obj->ob_type->tp_iternext != NULL &&`
Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,7 @@ PyException_SetContext(PyObject self, PyObject context)`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`#undef PyExceptionClass_Name`
	`346`	`+`
`346`	`347`	`char *`
`347`	`348`	`PyExceptionClass_Name(PyObject *ob)`
`348`	`349`	`{`