From: Victor Stinner <vstinner@python.org>
Date: Mon, 23 Mar 2020 23:48:03 +0000 (+0100)
Subject: Revert "bpo-1635741: Port _weakref extension module to multiphase initialization... 
X-Git-Tag: v3.9.0a6~294
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=188078c39dec24aa5b3f2073bdc9a68ebaae42de;p=thirdparty%2FPython%2Fcpython.git

Revert "bpo-1635741: Port _weakref extension module to multiphase initialization (PEP 489) (GH-19084)" (#19128)

bpo-1635741, bpo-40050: This reverts
commit 8334f30a74abcf7e469b901afc307887aa85a888.
---

diff --git a/Modules/_weakref.c b/Modules/_weakref.c
index cd7c4c159ac1..c1238e00d35f 100644
--- a/Modules/_weakref.c
+++ b/Modules/_weakref.c
@@ -136,48 +136,14 @@ weakref_functions[] =  {
     {NULL, NULL, 0, NULL}
 };
 
-static int
-weakref_exec(PyObject *module)
-{
-    Py_INCREF(&_PyWeakref_RefType);
-    if (PyModule_AddObject(module, "ref", (PyObject *) &_PyWeakref_RefType) < 0) {
-        Py_DECREF(&_PyWeakref_RefType);
-        return -1;
-    }
-    Py_INCREF(&_PyWeakref_RefType);
-    if (PyModule_AddObject(module, "ReferenceType",
-                           (PyObject *) &_PyWeakref_RefType) < 0) {
-        Py_DECREF(&_PyWeakref_RefType);
-        return -1;
-    }
-    Py_INCREF(&_PyWeakref_ProxyType);
-    if (PyModule_AddObject(module, "ProxyType",
-                           (PyObject *) &_PyWeakref_ProxyType) < 0) {
-        Py_DECREF(&_PyWeakref_ProxyType);
-        return -1;
-    }
-    Py_INCREF(&_PyWeakref_CallableProxyType);
-    if (PyModule_AddObject(module, "CallableProxyType",
-                           (PyObject *) &_PyWeakref_CallableProxyType) < 0) {
-        Py_DECREF(&_PyWeakref_CallableProxyType);
-        return -1;
-    }
-
-    return 0;
-}
-
-static struct PyModuleDef_Slot weakref_slots[] = {
-    {Py_mod_exec, weakref_exec},
-    {0, NULL}
-};
 
 static struct PyModuleDef weakrefmodule = {
     PyModuleDef_HEAD_INIT,
     "_weakref",
     "Weak-reference support module.",
-    0,
+    -1,
     weakref_functions,
-    weakref_slots,
+    NULL,
     NULL,
     NULL,
     NULL
@@ -186,5 +152,23 @@ static struct PyModuleDef weakrefmodule = {
 PyMODINIT_FUNC
 PyInit__weakref(void)
 {
-    return PyModuleDef_Init(&weakrefmodule);
+    PyObject *m;
+
+    m = PyModule_Create(&weakrefmodule);
+
+    if (m != NULL) {
+        Py_INCREF(&_PyWeakref_RefType);
+        PyModule_AddObject(m, "ref",
+                           (PyObject *) &_PyWeakref_RefType);
+        Py_INCREF(&_PyWeakref_RefType);
+        PyModule_AddObject(m, "ReferenceType",
+                           (PyObject *) &_PyWeakref_RefType);
+        Py_INCREF(&_PyWeakref_ProxyType);
+        PyModule_AddObject(m, "ProxyType",
+                           (PyObject *) &_PyWeakref_ProxyType);
+        Py_INCREF(&_PyWeakref_CallableProxyType);
+        PyModule_AddObject(m, "CallableProxyType",
+                           (PyObject *) &_PyWeakref_CallableProxyType);
+    }
+    return m;
 }