10000 [3.13] gh-127341: Argument Clinic: fix compiler warnings for getters … · python/cpython@a442c87 · GitHub
[go: up one dir, main page]
Skip to content

Commit a442c87

Browse files
ZeroIntensityerlend-aasland
ZeroIntensity
and
erlend-aasland
authored
[3.13] gh-127341: Argument Clinic: fix compiler warnings for getters with docstrings (GH-127310) (#127431)
(cherry picked from commit 9949091) Co-authored-by: Erlend E. Aasland <erlend@python.org>
1 parent c54b9ae commit a442c87

File tree

5 files changed

+28
-66
lines changed

5 files changed

+28
-66
lines changed

‎Lib/test/clinic.test.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4956,9 +4956,7 @@ Test_meth_coexist_impl(TestObj *self)
49564956
Test.property
49574957
[clinic start generated code]*/
49584958

4959-
#if defined(Test_property_HAS_DOCSTR)
4960-
# define Test_property_DOCSTR Test_property__doc__
4961-
#else
4959+
#if !defined(Test_property_DOCSTR)
49624960
# define Test_property_DOCSTR NULL
49634961
#endif
49644962
#if defined(TEST_PROPERTY_GETSETDEF)
@@ -4979,16 +4977,14 @@ Test_property_get(TestObj *self, void *Py_UNUSED(context))
49794977

49804978
static PyObject *
49814979
Test_property_get_impl(TestObj *self)
4982-
/*[clinic end generated code: output=27b519719d992e03 input=2d92b3449fbc7d2b]*/
4980+
/*[clinic end generated code: output=7cadd0f539805266 input=2d92b3449fbc7d2b]*/
49834981

49844982
/*[clinic input]
49854983
@setter
49864984
Test.property
49874985
[clinic start generated code]*/
49884986

4989-
#if defined(TEST_PROPERTY_HAS_DOCSTR)
4990-
# define Test_property_DOCSTR Test_property__doc__
4991-
#else
4987+
#if !defined(Test_property_DOCSTR)
49924988
# define Test_property_DOCSTR NULL
49934989
#endif
49944990
#if defined(TEST_PROPERTY_GETSETDEF)
@@ -5013,7 +5009,7 @@ Test_property_set(TestObj *self, PyObject *value, void *Py_UNUSED(context))
50135009

50145010
static int
50155011
Test_property_set_impl(TestObj *self, PyObject *value)
5016-
/*[clinic end generated code: output=d51023f17c4ac3a1 input=3bc3f46a23c83a88]*/
5012+
/*[clinic end generated code: output=e4342fe9bb1d7817 input=3bc3f46a23c83a88]*/
50175013

50185014
/*[clinic input]
50195015
output push

‎Modules/_io/clinic/bufferedio.c.h

Lines changed: 4 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Modules/_io/clinic/stringio.c.h

Lines changed: 4 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Modules/_io/clinic/textio.c.h

Lines changed: 13 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tools/clinic/libclinic/parse_args.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def declare_parser(
146146
GETSET_DOCSTRING_PROTOTYPE_STRVAR: Final[str] = libclinic.normalize_snippet("""
147147
PyDoc_STRVAR({getset_basename}__doc__,
148148
{docstring});
149-
#define {getset_basename}_HAS_DOCSTR
149+
#define {getset_basename}_DOCSTR {getset_basename}__doc__
150150
""")
151151
IMPL_DEFINITION_PROTOTYPE: Final[str] = libclinic.normalize_snippet("""
152152
static {impl_return_type}
@@ -157,9 +157,7 @@ def declare_parser(
157157
{{"{name}", {methoddef_cast}{c_basename}{methoddef_cast_end}, {methoddef_flags}, {c_basename}__doc__}},
158158
""")
159159
GETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r"""
160-
#if defined({getset_basename}_HAS_DOCSTR)
161-
# define {getset_basename}_DOCSTR {getset_basename}__doc__
162-
#else
160+
#if !defined({getset_basename}_DOCSTR)
163161
# define {getset_basename}_DOCSTR NULL
164162
#endif
165163
#if defined({getset_name}_GETSETDEF)
@@ -170,9 +168,7 @@ def declare_parser(
170168
#endif
171169
""")
172170
SETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r"""
173-
#if defined({getset_name}_HAS_DOCSTR)
174-
# define {getset_basename}_DOCSTR {getset_basename}__doc__
175-
#else
171+
#if !defined({getset_basename}_DOCSTR)
176172
# define {getset_basename}_DOCSTR NULL
177173
#endif
178174
#if defined({getset_name}_GETSETDEF)

0 commit comments

Comments
 (0)
0