bpo-40989: PyObject_INIT() becomes an alias to PyObject_Init() (GH-20901)
The PyObject_INIT() and PyObject_INIT_VAR() macros become aliases to,
respectively, PyObject_Init() and PyObject_InitVar() functions.
Rename _PyObject_INIT() and _PyObject_INIT_VAR() static inline
functions to, respectively, _PyObject_Init() and _PyObject_InitVar(),
and move them to pycore_object.h. Remove their return value:
their return type becomes void.
The _datetime module is now built with the Py_BUILD_CORE_MODULE macro
defined.
Remove an outdated comment on _Py_tracemalloc_config.
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index a490377..d983a30 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -6,8 +6,10 @@
/* Submitted by Jim Hugunin */
#include "Python.h"
+#include "pycore_object.h" // _PyObject_Init()
#include "structmember.h" // PyMemberDef
+
/*[clinic input]
class complex "PyComplexObject *" "&PyComplex_Type"
[clinic start generated code]*/
@@ -229,13 +231,12 @@
PyObject *
PyComplex_FromCComplex(Py_complex cval)
{
- PyComplexObject *op;
-
/* Inline PyObject_New */
- op = (PyComplexObject *) PyObject_MALLOC(sizeof(PyComplexObject));
- if (op == NULL)
+ PyComplexObject *op = PyObject_MALLOC(sizeof(PyComplexObject));
+ if (op == NULL) {
return PyErr_NoMemory();
- (void)PyObject_INIT(op, &PyComplex_Type);
+ }
+ _PyObject_Init((PyObject*)op, &PyComplex_Type);
op->cval = cval;
return (PyObject *) op;
}