Skip to content

bpo-1635741: _contextvars uses PyModule_AddType() #23147

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

Merged
vstinner merged 1 commit into from
Nov 4, 2020
Merged

bpo-1635741: _contextvars uses PyModule_AddType() #23147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
bpo-1635741: _contextvars uses PyModule_AddType() 
Replace PyModule_AddObject() with PyModule_AddType() in the
_contextvars module (Python-ast.c).

Add also the module name to _contextvars types to get qualified
names.
  • Loading branch information
@vstinner
vstinner committed Nov 4, 2020
commit d7ffa0d6140ab508e3182aa6b1a056f760efd531
21 changes: 3 additions & 18 deletions Modules/_contextvarsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,15 @@ static PyMethodDef _contextvars_methods[] = {
static int
_contextvars_exec(PyObject *m)
{
Py_INCREF(&PyContext_Type);
if (PyModule_AddObject(m, "Context",
(PyObject *)&PyContext_Type) < 0)
{
Py_DECREF(&PyContext_Type);
if (PyModule_AddType(m, &PyContext_Type) < 0) {
return -1;
}

Py_INCREF(&PyContextVar_Type);
if (PyModule_AddObject(m, "ContextVar",
(PyObject *)&PyContextVar_Type) < 0)
{
Py_DECREF(&PyContextVar_Type);
if (PyModule_AddType(m, &PyContextVar_Type) < 0) {
return -1;
}

Py_INCREF(&PyContextToken_Type);
if (PyModule_AddObject(m, "Token",
(PyObject *)&PyContextToken_Type) < 0)
{
Py_DECREF(&PyContextToken_Type);
if (PyModule_AddType(m, &PyContextToken_Type) < 0) {
return -1;
}

return 0;
}

Expand Down
6 changes: 3 additions & 3 deletions Python/context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ static PyMappingMethods PyContext_as_mapping = {

PyTypeObject PyContext_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"Context",
"_contextvars.Context",
sizeof(PyContext),
.tp_methods = PyContext_methods,
.tp_as_mapping = &PyContext_as_mapping,
Expand Down Expand Up @@ -1056,7 +1056,7 @@ static PyMethodDef PyContextVar_methods[] = {

PyTypeObject PyContextVar_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"ContextVar",
"_contextvars.ContextVar",
sizeof(PyContextVar),
.tp_methods = PyContextVar_methods,
.tp_members = PyContextVar_members,
Expand Down Expand Up @@ -1197,7 +1197,7 @@ static PyMethodDef PyContextTokenType_methods[] = {

PyTypeObject PyContextToken_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"Token",
"_contextvars.Token",
sizeof(PyContextToken),
.tp_methods = PyContextTokenType_methods,
.tp_getset = PyContextTokenType_getsetlist,
Expand Down