bpo-46541: Remove usage of _Py_IDENTIFIER from dbms modules

corona10 · corona10 · commit 38fa7c526624 · 2022-02-16T11:34:11.000+09:00
diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c
@@ -1,9 +1,7 @@
 
 /* DBM module using dictionary interface */
 
-
 #define PY_SSIZE_T_CLEAN
-#define NEEDS_PY_IDENTIFIER
 #include "Python.h"
 
 #include <sys/types.h>
@@ -38,6 +36,7 @@
 typedef struct {
     PyTypeObject *dbm_type;
     PyObject *dbm_error;
+    PyObject *str_close;
 } _dbm_state;
 
 static inline _dbm_state*
@@ -396,8 +395,9 @@ dbm__enter__(PyObject *self, PyObject *args)
 static PyObject *
 dbm__exit__(PyObject *self, PyObject *args)
 {
-    _Py_IDENTIFIER(close);
-    return _PyObject_CallMethodIdNoArgs(self, &PyId_close);
+    _dbm_state *state = PyType_GetModuleState(Py_TYPE(self));
+    assert(state != NULL);
+    return PyObject_CallMethodNoArgs(self, state->str_close);
 }
 
 static PyMethodDef dbm_methods[] = {
@@ -526,6 +526,12 @@ _dbm_exec(PyObject *module)
     if (PyModule_AddType(module, (PyTypeObject *)state->dbm_error) < 0) {
         return -1;
     }
+
+    PyObject *str_close = PyUnicode_InternFromString("close");
+    if (str_close == NULL) {
+        return -1;
+    }
+    state->str_close = str_close;
     return 0;
 }
 
@@ -535,6 +541,7 @@ _dbm_module_traverse(PyObject *module, visitproc visit, void *arg)
     _dbm_state *state = get_dbm_state(module);
     Py_VISIT(state->dbm_error);
     Py_VISIT(state->dbm_type);
+    Py_VISIT(state->str_close);
     return 0;
 }
 
@@ -544,6 +551,7 @@ _dbm_module_clear(PyObject *module)
     _dbm_state *state = get_dbm_state(module);
     Py_CLEAR(state->dbm_error);
     Py_CLEAR(state->dbm_type);
+    Py_CLEAR(state->str_close);
     return 0;
 }
 
diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c
@@ -4,7 +4,6 @@
 /* Doc strings: Mitch Chapman */
 
 #define PY_SSIZE_T_CLEAN
-#define NEEDS_PY_IDENTIFIER
 #include "Python.h"
 #include "gdbm.h"
 
@@ -21,6 +20,7 @@ extern const char * gdbm_strerror(gdbm_error);
 typedef struct {
     PyTypeObject *gdbm_type;
     PyObject *gdbm_error;
+    PyObject *str_close;
 } _gdbm_state;
 
 static inline _gdbm_state*
@@ -545,8 +545,9 @@ gdbm__enter__(PyObject *self, PyObject *args)
 static PyObject *
 gdbm__exit__(PyObject *self, PyObject *args)
 {
-    _Py_IDENTIFIER(close);
-    return _PyObject_CallMethodIdNoArgs(self, &PyId_close);
+    _gdbm_state *state = PyType_GetModuleState(Py_TYPE(self));
+    assert(state != NULL);
+    return PyObject_CallMethodNoArgs(self, state->str_close);
 }
 
 static PyMethodDef gdbm_methods[] = {
@@ -740,6 +741,11 @@ _gdbm_exec(PyObject *module)
         return -1;
     }
 #endif
+    PyObject *str_close = PyUnicode_InternFromString("close");
+    if (str_close == NULL) {
+        return -1;
+    }
+    state->str_close = str_close;
     return 0;
 }
 
@@ -749,6 +755,7 @@ _gdbm_module_traverse(PyObject *module, visitproc visit, void *arg)
     _gdbm_state *state = get_gdbm_state(module);
     Py_VISIT(state->gdbm_error);
     Py_VISIT(state->gdbm_type);
+    Py_VISIT(state->str_close);
     return 0;
 }
 
@@ -758,6 +765,7 @@ _gdbm_module_clear(PyObject *module)
     _gdbm_state *state = get_gdbm_state(module);
     Py_CLEAR(state->gdbm_error);
     Py_CLEAR(state->gdbm_type);
+    Py_CLEAR(state->str_close);
     return 0;
 }
 
