[Python-checkins] bpo-1635741: Port sha256 module to multiphase init (PEP 489) (GH-21189)
Mohamed Koubaa
webhook-mailer at python.org
Fri Jul 3 05:00:15 EDT 2020
https://github.com/python/cpython/commit/9d006977d7ff5a45d6e7d696c1713fdf2dd308b7
commit: 9d006977d7ff5a45d6e7d696c1713fdf2dd308b7
branch: master
author: Mohamed Koubaa <koubaa.m at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020-07-03T17:59:47+09:00
summary:
bpo-1635741: Port sha256 module to multiphase init (PEP 489) (GH-21189)
files:
A Misc/NEWS.d/next/Core and Builtins/2020-07-01-20-17-38.bpo-1635741.-AtPYu.rst
M Modules/sha256module.c
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-07-01-20-17-38.bpo-1635741.-AtPYu.rst b/Misc/NEWS.d/next/Core and Builtins/2020-07-01-20-17-38.bpo-1635741.-AtPYu.rst
new file mode 100644
index 0000000000000..c529923779fa8
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2020-07-01-20-17-38.bpo-1635741.-AtPYu.rst
@@ -0,0 +1 @@
+Port :mod:`sha256` to multiphase initialization
diff --git a/Modules/sha256module.c b/Modules/sha256module.c
index 261f9daee2807..06e4430bd7c33 100644
--- a/Modules/sha256module.c
+++ b/Modules/sha256module.c
@@ -681,43 +681,45 @@ 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);
+ if (PyModule_AddObject(module, "SHA224Type", (PyObject *)&SHA224type) < 0) {
+ Py_DECREF((PyObject *)&SHA224type);
+ return -1;
+ }
Py_INCREF((PyObject *)&SHA256type);
- PyModule_AddObject(m, "SHA256Type", (PyObject *)&SHA256type);
- return m;
+ if (PyModule_AddObject(module, "SHA256Type", (PyObject *)&SHA256type) < 0) {
+ Py_DECREF((PyObject *)&SHA256type);
+ return -1;
+ }
+ return 0;
+}
+
+static PyModuleDef_Slot _sha256_slots[] = {
+ {Py_mod_exec, sha256_exec},
+ {0, NULL}
+};
+
+static struct PyModuleDef _sha256module = {
+ PyModuleDef_HEAD_INIT,
+ .m_name = "_sha256",
+ .m_methods = SHA_functions,
+ .m_slots = _sha256_slots,
+};
+/* Initialize this module. */
+PyMODINIT_FUNC
+PyInit__sha256(void)
+{
+ return PyModuleDef_Init(&_sha256module);
}
More information about the Python-checkins
mailing list