Skip to content

bpo-38823: Add a private _PyModule_StealObject API. #17298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

bpo-38823: Add a private _PyModule_StealObject API. #17298

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a59525c
Add private _PyModule_StealObject API.
brandtbucher Nov 20, 2019
f3e806e
Add _PyModule_StealObject to modsupport.h.
brandtbucher Nov 20, 2019
440bb72
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 20, 2019
418d79b
Clean up refleaks in _warnings initialization.
brandtbucher Jan 28, 2020
5fef8fb
Clean up refleaks in _msi initialization.
brandtbucher Jan 28, 2020
b1fb276
Clean up refleaks in _functools initialization.
brandtbucher Jan 28, 2020
08a8060
Clean up refleaks in _collections initialization.
brandtbucher Jan 28, 2020
95f9800
Clean up refleaks in _bz2 initialization.
brandtbucher Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Include/modsupport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ void _PyArg_Fini(void);
#endif /* Py_LIMITED_API */

PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *);
PyAPI_FUNC(int) _PyModule_StealObject(PyObject *, const char *, PyObject *);
PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long);
PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *);
#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c)
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/C API/2019-11-20-18-47-48.bpo-38823.x1nghH.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Add a new private ``_PyModule_StealObject`` API. It is identical to :c:func:`PyModule_AddObject`, but steals a reference to the added object on both success *and* failure.

Patch by Brandt Bucher.
13 changes: 13 additions & 0 deletions Python/modsupport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,19 @@ PyModule_AddObject(PyObject *m, const char *name, PyObject *o)
return 0;
}

/* Like PyModule_AddObject, but steals o on success AND failure.
This is probably what you want! */

int
_PyModule_StealObject(PyObject *m, const char *name, PyObject *o)
{
if (PyModule_AddObject(m, name, o) < 0) {
Py_XDECREF(o);
return -1;
}
return 0;
}

int
PyModule_AddIntConstant(PyObject *m, const char *name, long value)
{
Expand Down