mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 21:11:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-86493: Modernize modules initialization code (GH-106858)

Browse source 
Use PyModule_Add() or PyModule_AddObjectRef() instead of soft deprecated
PyModule_AddObject().
This commit is contained in:
Serhiy Storchaka 2023-07-25 14:34:49 +03:00 • committed by GitHub
parent f443b54a2f
commit 329e4a1a3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 84 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Modules/_tkinter.c
View file

@ -3197,7 +3197,7 @@ static struct PyModuleDef _tkintermodule = {
PyMODINIT_FUNC
PyInit__tkinter(void)
{
PyObject *m, *uexe, *cexe, *o;
PyObject *m, *uexe, *cexe;
tcl_lock = PyThread_allocate_lock();
if (tcl_lock == NULL)
@ -3207,17 +3207,11 @@ PyInit__tkinter(void)
if (m == NULL)
return NULL;
o = PyErr_NewException("_tkinter.TclError", NULL, NULL);
if (o == NULL) {
Tkinter_TclError = PyErr_NewException("_tkinter.TclError", NULL, NULL);
if (PyModule_AddObjectRef(m, "TclError", Tkinter_TclError)) {
Py_DECREF(m);
return NULL;
}
if (PyModule_AddObject(m, "TclError", Py_NewRef(o))) {
Py_DECREF(o);
Py_DECREF(m);
return NULL;
}
Tkinter_TclError = o;
if (PyModule_AddIntConstant(m, "READABLE", TCL_READABLE)) {
Py_DECREF(m);
@ -3264,41 +3258,23 @@ PyInit__tkinter(void)
return NULL;
}
o = PyType_FromSpec(&Tkapp_Type_spec);
if (o == NULL) {
Tkapp_Type = PyType_FromSpec(&Tkapp_Type_spec);
if (PyModule_AddObjectRef(m, "TkappType", Tkapp_Type)) {
Py_DECREF(m);
return NULL;
}
if (PyModule_AddObject(m, "TkappType", o)) {
Py_DECREF(o);
Py_DECREF(m);
return NULL;
}
Tkapp_Type = o;
o = PyType_FromSpec(&Tktt_Type_spec);
if (o == NULL) {
Tktt_Type = PyType_FromSpec(&Tktt_Type_spec);
if (PyModule_AddObjectRef(m, "TkttType", Tktt_Type)) {
Py_DECREF(m);
return NULL;
}
if (PyModule_AddObject(m, "TkttType", o)) {
Py_DECREF(o);
Py_DECREF(m);
return NULL;
}
Tktt_Type = o;
o = PyType_FromSpec(&PyTclObject_Type_spec);
if (o == NULL) {
PyTclObject_Type = PyType_FromSpec(&PyTclObject_Type_spec);
if (PyModule_AddObjectRef(m, "Tcl_Obj", PyTclObject_Type)) {
Py_DECREF(m);
return NULL;
}
if (PyModule_AddObject(m, "Tcl_Obj", o)) {
Py_DECREF(o);
Py_DECREF(m);
return NULL;
}
PyTclObject_Type = o;
/* This helps the dynamic loader; in Unicode aware Tcl versions