bpo-46541: Remove usage of _Py_IDENTIFIER from dbms modules (GH-31358)

corona10 · web-flow · commit e59309b9d096 · 2022-02-16T18:57:28.000+09:00
diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c
@@ -3,7 +3,6 @@
 
 
 #define PY_SSIZE_T_CLEAN
-#define NEEDS_PY_IDENTIFIER
 #include "Python.h"
 
 #include <sys/types.h>
@@ -396,8 +395,7 @@ dbm__enter__(PyObject *self, PyObject *args)
 static PyObject *
 dbm__exit__(PyObject *self, PyObject *args)
 {
-    _Py_IDENTIFIER(close);
-    return _PyObject_CallMethodIdNoArgs(self, &PyId_close);
+    return _dbm_dbm_close_impl((dbmobject *)self);
 }
 
 static PyMethodDef dbm_methods[] = {
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"
 
@@ -545,8 +544,7 @@ gdbm__enter__(PyObject *self, PyObject *args)
 static PyObject *
 gdbm__exit__(PyObject *self, PyObject *args)
 {
-    _Py_IDENTIFIER(close);
-    return _PyObject_CallMethodIdNoArgs(self, &PyId_close);
+    return _gdbm_gdbm_close_impl((gdbmobject *)self);
 }
 
 static PyMethodDef gdbm_methods[] = {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`
`5`	`5`	`#define PY_SSIZE_T_CLEAN`
`6`		`-#define NEEDS_PY_IDENTIFIER`
`7`	`6`	`#include "Python.h"`
`8`	`7`
`9`	`8`	`#include <sys/types.h>`
`@@ -396,8 +395,7 @@ dbm__enter__(PyObject self, PyObject args)`
`396`	`395`	`static PyObject *`
`397`	`396`	`dbm__exit__(PyObject self, PyObject args)`
`398`	`397`	`{`
`399`		`- _Py_IDENTIFIER(close);`
`400`		`- return _PyObject_CallMethodIdNoArgs(self, &PyId_close);`
	`398`	`+ return _dbm_dbm_close_impl((dbmobject *)self);`
`401`	`399`	`}`
`402`	`400`
`403`	`401`	`static PyMethodDef dbm_methods[] = {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`/* Doc strings: Mitch Chapman */`
`5`	`5`
`6`	`6`	`#define PY_SSIZE_T_CLEAN`
`7`		`-#define NEEDS_PY_IDENTIFIER`
`8`	`7`	`#include "Python.h"`
`9`	`8`	`#include "gdbm.h"`
`10`	`9`
`@@ -545,8 +544,7 @@ gdbm__enter__(PyObject self, PyObject args)`
`545`	`544`	`static PyObject *`
`546`	`545`	`gdbm__exit__(PyObject self, PyObject args)`
`547`	`546`	`{`
`548`		`- _Py_IDENTIFIER(close);`
`549`		`- return _PyObject_CallMethodIdNoArgs(self, &PyId_close);`
	`547`	`+ return _gdbm_gdbm_close_impl((gdbmobject *)self);`
`550`	`548`	`}`
`551`	`549`
`552`	`550`	`static PyMethodDef gdbm_methods[] = {`