Update define macro

corona10 · Nov 25, 2023 · ea83973 · ea83973
1 parent 72d9018
commit ea83973
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
@@ -2526,9 +2526,9 @@ static PyMemberDef bufferedreader_members[] = {
 };
 
 static PyGetSetDef bufferedreader_getset[] = {
-    _IO__BUFFERED_CLOSED_GET_GETTERDEF
-    _IO__BUFFERED_NAME_GET_GETTERDEF
-    _IO__BUFFERED_MODE_GET_GETTERDEF
+    _IO__BUFFERED_CLOSED_GETTERDEF
+    _IO__BUFFERED_NAME_GETTERDEF
+    _IO__BUFFERED_MODE_GETTERDEF
     {NULL}
 };
 
@@ -2586,9 +2586,9 @@ static PyMemberDef bufferedwriter_members[] = {
 };
 
 static PyGetSetDef bufferedwriter_getset[] = {
-    _IO__BUFFERED_CLOSED_GET_GETTERDEF
-    _IO__BUFFERED_NAME_GET_GETTERDEF
-    _IO__BUFFERED_MODE_GET_GETTERDEF
+    _IO__BUFFERED_CLOSED_GETTERDEF
+    _IO__BUFFERED_NAME_GETTERDEF
+    _IO__BUFFERED_MODE_GETTERDEF
     {NULL}
 };
 
@@ -2704,9 +2704,9 @@ static PyMemberDef bufferedrandom_members[] = {
 };
 
 static PyGetSetDef bufferedrandom_getset[] = {
-    _IO__BUFFERED_CLOSED_GET_GETTERDEF
-    _IO__BUFFERED_NAME_GET_GETTERDEF
-    _IO__BUFFERED_MODE_GET_GETTERDEF
+    _IO__BUFFERED_CLOSED_GETTERDEF
+    _IO__BUFFERED_NAME_GETTERDEF
+    _IO__BUFFERED_MODE_GETTERDEF
     {NULL}
 };
 

diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
@@ -1944,11 +1944,12 @@ def render_function(
         full_name = f.full_name
         template_dict = {'full_name': full_name}
         template_dict['name'] = f.displayname
-        template_dict['c_basename'] = f.c_basename
         if f.getter:
             template_dict['methoddef_name'] = f.c_basename.upper() + "_GETTERDEF"
+            template_dict['c_basename'] = f.c_basename + "_get"
         else:
             template_dict['methoddef_name'] = f.c_basename.upper() + "_METHODDEF"
+            template_dict['c_basename'] = f.c_basename
 
         template_dict['docstring'] = self.docstring_for_c_string(f)
 
@@ -5533,8 +5534,6 @@ def state_modulename_name(self, line: str) -> None:
         line, _, returns = line.partition('->')
         returns = returns.strip()
         full_name, c_basename = self.parse_function_names(line)
-        if self.getter:
-            c_basename += '_get'
 
         return_converter = None
         if returns: