From: Hai Shi <shihai1992@gmail.com>
Date: Thu, 19 Mar 2020 17:11:33 +0000 (+0800)
Subject: bpo-39824: Convert PyModule_GetState() to get_module_state() (GH-19076)
X-Git-Tag: v3.9.0a5~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13397ee47d23fda2e8d4bef40c1df986457673d1;p=thirdparty%2FPython%2Fcpython.git

bpo-39824: Convert PyModule_GetState() to get_module_state() (GH-19076)



Automerge-Triggered-By: @vstinner
---

diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index d2202bcad9f5..0ce5dc5e7777 100644
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -775,25 +775,25 @@ static struct PyModuleDef_Slot _locale_slots[] = {
 };
 
 static int
-locale_traverse(PyObject *m, visitproc visit, void *arg)
+locale_traverse(PyObject *module, visitproc visit, void *arg)
 {
-    _locale_state *state = (_locale_state*)PyModule_GetState(m);
+    _locale_state *state = get_locale_state(module);
     Py_VISIT(state->Error);
     return 0;
 }
 
 static int
-locale_clear(PyObject *m)
+locale_clear(PyObject *module)
 {
-    _locale_state *state = (_locale_state*)PyModule_GetState(m);
+    _locale_state *state = get_locale_state(module);
     Py_CLEAR(state->Error);
     return 0;
 }
 
 static void
-locale_free(PyObject *m)
+locale_free(PyObject *module)
 {
-    locale_clear(m);
+    locale_clear(module);
 }
 
 static struct PyModuleDef _localemodule = {
diff --git a/Modules/audioop.c b/Modules/audioop.c
index 64cf98137c88..3aeb6f04f13c 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -1925,7 +1925,7 @@ static PyMethodDef audioop_methods[] = {
 static int
 audioop_traverse(PyObject *module, visitproc visit, void *arg)
 {
-    audioop_state *state = (audioop_state *)PyModule_GetState(module);
+    audioop_state *state = get_audioop_state(module);
     Py_VISIT(state->AudioopError);
     return 0;
 }
@@ -1933,7 +1933,7 @@ audioop_traverse(PyObject *module, visitproc visit, void *arg)
 static int
 audioop_clear(PyObject *module)
 {
-    audioop_state *state = (audioop_state *)PyModule_GetState(module);
+    audioop_state *state = get_audioop_state(module);
     Py_CLEAR(state->AudioopError);
     return 0;
 }