Port sha256 module to multi-phase init (PEP 489)

python · corona10 · Jul 3, 2020 · Jun 27, 2020 · Jul 2, 2020 · Jul 2, 2020
commit 9f9e45abb9f69538b24164999d6e5fd8ec8611ef
diff --git a/Modules/sha256module.c b/Modules/sha256module.c
@@ -681,43 +681,44 @@ static struct PyMethodDef SHA_functions[] = {
    {NULL,      NULL}            /* Sentinel */
 };

-
-/* Initialize this module. */
-
-static struct PyModuleDef _sha256module = {
-        PyModuleDef_HEAD_INIT,
-        "_sha256",
-        NULL,
-        -1,
-        SHA_functions,
-        NULL,
-        NULL,
-        NULL,
-        NULL
-};
-
-PyMODINIT_FUNC
-PyInit__sha256(void)
+static int sha256_exec(PyObject *module)
 {
-    PyObject *m;
-
    Py_SET_TYPE(&SHA224type, &PyType_Type);
    if (PyType_Ready(&SHA224type) < 0) {
-        return NULL;
+        return -1;
    }
    Py_SET_TYPE(&SHA256type, &PyType_Type);
    if (PyType_Ready(&SHA256type) < 0) {
-        return NULL;
+        return -1;
    }

-    m = PyModule_Create(&_sha256module);
-    if (m == NULL)
-        return NULL;
-
    Py_INCREF((PyObject *)&SHA224type);
-    PyModule_AddObject(m, "SHA224Type", (PyObject *)&SHA224type);
+    PyModule_AddObject(module, "SHA224Type", (PyObject *)&SHA224type);
    Py_INCREF((PyObject *)&SHA256type);
-    PyModule_AddObject(m, "SHA256Type", (PyObject *)&SHA256type);
-    return m;
+    PyModule_AddObject(module, "SHA256Type", (PyObject *)&SHA256type);
+    return 0;
+}
+
+static PyModuleDef_Slot _sha256_slots[] = {
+    {Py_mod_exec, sha256_exec},
+    {0, NULL}
+};

+static struct PyModuleDef _sha256module = {
+    PyModuleDef_HEAD_INIT,
+    "_sha256",
+    NULL,
+    0,
+    SHA_functions,
+    _sha256_slots,
+    NULL,
+    NULL,
+    NULL
+};
+
+/* Initialize this module. */
+PyMODINIT_FUNC
+PyInit__sha256(void)
+{
+    return PyModuleDef_Init(&_sha256module);
 }