[Python-checkins] bpo-1635741: _contextvars uses PyModule_AddType() (GH-23147)

Wed Nov 4 10:34:06 EST 2020

https://github.com/python/cpython/commit/988f1ec8d2643a0d00851903abcdae90d57ac0e6
commit: 988f1ec8d2643a0d00851903abcdae90d57ac0e6
branch: master
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2020年11月04日T16:33:55+01:00
summary:
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.
files:
M Modules/_contextvarsmodule.c
M Python/context.c

diff --git a/Modules/_contextvarsmodule.c b/Modules/_contextvarsmodule.c
index d6d7f375d1230..d13b5962c13c4 100644
--- a/Modules/_contextvarsmodule.c
+++ b/Modules/_contextvarsmodule.c
@@ -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;
 }
 
diff --git a/Python/context.c b/Python/context.c
index 15d8b8ea4b9b6..82826bf928fa0 100644
--- a/Python/context.c
+++ b/Python/context.c
@@ -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,
