mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
bpo-1635741: _contextvars uses PyModule_AddType() (GH-23147)
Replace PyModule_AddObject() with PyModule_AddType() in the _contextvars module (Python-ast.c). Add also the module name to _contextvars types name.
This commit is contained in:
parent
cfb41e80c1
commit
988f1ec8d2
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue