Skip to content

Commit 1fb5a9f

Browse files
authored
bpo-39873: PyObject_Init() uses PyObject_INIT() (GH-18804)
Avoid duplicated code: * PyObject_Init() uses PyObject_INIT() * PyObject_InitVar() uses PyObject_INIT_VAR()
1 parent 7598a93 commit 1fb5a9f

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

Objects/object.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,7 @@ PyObject_Init(PyObject *op, PyTypeObject *tp)
144144
return PyErr_NoMemory();
145145
}
146146

147-
Py_SET_TYPE(op, tp);
148-
if (PyType_GetFlags(tp) & Py_TPFLAGS_HEAPTYPE) {
149-
Py_INCREF(tp);
150-
}
151-
_Py_NewReference(op);
152-
return op;
147+
return PyObject_INIT(op, tp);
153148
}
154149

155150
PyVarObject *
@@ -160,9 +155,7 @@ PyObject_InitVar(PyVarObject *op, PyTypeObject *tp, Py_ssize_t size)
160155
return (PyVarObject *) PyErr_NoMemory();
161156
}
162157

163-
Py_SET_SIZE(op, size);
164-
PyObject_Init((PyObject *)op, tp);
165-
return op;
158+
return PyObject_INIT_VAR(op, tp, size);
166159
}
167160

168161
PyObject *

0 commit comments

Comments
 (0)