bpo-33738: Address review comments in GH #7477 (GH-7585)
diff --git a/Include/abstract.h b/Include/abstract.h
index e7bc2d2..c1297db 100644
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -598,7 +598,7 @@
((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
index a9929f5..5fd981c 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -142,9 +142,9 @@
#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
index 0d66c4b..0b7365d 100644
--- 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
index e2700e3..192ade1 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1245,6 +1245,7 @@
}
#undef PyIndex_Check
+
int
PyIndex_Check(PyObject *obj)
{
@@ -2544,6 +2545,7 @@
}
#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
index bcb1fd5..7beb2a2 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -343,6 +343,7 @@
}
#undef PyExceptionClass_Name
+
char *
PyExceptionClass_Name(PyObject *ob)
{