bpo-40024: Update C extension modules to use PyModule_AddType() (GH-19119)
Update _asyncio, _bz2, _csv, _curses, _datetime,
_io, _operator, _pickle, _queue, blake2,
multibytecodec and overlapped C extension modules
to use PyModule_AddType().
diff --git a/Modules/_blake2/blake2module.c b/Modules/_blake2/blake2module.c
index 9d280a9..ff142c9 100644
--- a/Modules/_blake2/blake2module.c
+++ b/Modules/_blake2/blake2module.c
@@ -63,13 +63,10 @@
/* BLAKE2b */
Py_SET_TYPE(&PyBlake2_BLAKE2bType, &PyType_Type);
- if (PyType_Ready(&PyBlake2_BLAKE2bType) < 0) {
+ if (PyModule_AddType(m, &PyBlake2_BLAKE2bType) < 0) {
return NULL;
}
- Py_INCREF(&PyBlake2_BLAKE2bType);
- PyModule_AddObject(m, "blake2b", (PyObject *)&PyBlake2_BLAKE2bType);
-
d = PyBlake2_BLAKE2bType.tp_dict;
ADD_INT(d, "SALT_SIZE", BLAKE2B_SALTBYTES);
ADD_INT(d, "PERSON_SIZE", BLAKE2B_PERSONALBYTES);
@@ -83,13 +80,10 @@
/* BLAKE2s */
Py_SET_TYPE(&PyBlake2_BLAKE2sType, &PyType_Type);
- if (PyType_Ready(&PyBlake2_BLAKE2sType) < 0) {
+ if (PyModule_AddType(m, &PyBlake2_BLAKE2sType) < 0) {
return NULL;
}
- Py_INCREF(&PyBlake2_BLAKE2sType);
- PyModule_AddObject(m, "blake2s", (PyObject *)&PyBlake2_BLAKE2sType);
-
d = PyBlake2_BLAKE2sType.tp_dict;
ADD_INT(d, "SALT_SIZE", BLAKE2S_SALTBYTES);
ADD_INT(d, "PERSON_SIZE", BLAKE2S_PERSONALBYTES);