gh-127341: Argument Clinic: fix compiler warnings for getters with docstrings - #127310
Merged
erlend-aasland merged 5 commits intoNov 29, 2024
Merged
Conversation
Member
|
It seems you forgot |
Member
Author
Yeah, that would be it. Fixed! |
skirpichev
self-requested a review
November 27, 2024 02:24
Contributor
|
I don't like the original approach that was taken when the diff --git a/Tools/clinic/libclinic/parse_args.py b/Tools/clinic/libclinic/parse_args.py
index fc2d9fe9870..a57d729bec5 100644
--- a/Tools/clinic/libclinic/parse_args.py
+++ b/Tools/clinic/libclinic/parse_args.py
@@ -146,7 +146,7 @@ def declare_parser(
GETSET_DOCSTRING_PROTOTYPE_STRVAR: Final[str] = libclinic.normalize_snippet("""
PyDoc_STRVAR({getset_basename}__doc__,
{docstring});
- #define {getset_basename}_HAS_DOCSTR
+ #define {getset_basename}_DOCSTR {getset_basename}__doc__
""")
IMPL_DEFINITION_PROTOTYPE: Final[str] = libclinic.normalize_snippet("""
static {impl_return_type}
@@ -157,9 +157,7 @@ def declare_parser(
{{"{name}", {methoddef_cast}{c_basename}{methoddef_cast_end}, {methoddef_flags}, {c_basename}__doc__}},
""")
GETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r"""
- #if defined({getset_basename}_HAS_DOCSTR)
- # define {getset_basename}_DOCSTR {getset_basename}__doc__
- #else
+ #if !defined({getset_basename}_DOCSTR)
# define {getset_basename}_DOCSTR NULL
#endif
#if defined({getset_name}_GETSETDEF)
@@ -170,9 +168,7 @@ def declare_parser(
#endif
""")
SETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r"""
- #if defined({getset_name}_HAS_DOCSTR)
- # define {getset_basename}_DOCSTR {getset_basename}__doc__
- #else
+ #if !defined({getset_basename}_DOCSTR)
# define {getset_basename}_DOCSTR NULL
#endif
#if defined({getset_name}_GETSETDEF) |
Contributor
|
BTW, I think we should record why this was a bug in an issue, and then link this PR to that issue. |
ZeroIntensity
changed the title
skirpichev
approved these changes
Nov 28, 2024
erlend-aasland
changed the title
erlend-aasland
approved these changes
Nov 29, 2024
erlend-aasland
left a comment
erlend-aasland
left a comment
Contributor
There was a problem hiding this comment.
Thanks for identifying and fixing this!
This comment was marked as outdated.
This comment was marked as outdated.
|
Sorry, @ZeroIntensity and @erlend-aasland, I could not cleanly backport this to |
Member
Author
|
I'll deal with backporting. |
ZeroIntensity
added a commit
to ZeroIntensity/cpython
that referenced
this pull request
Nov 29, 2024
…tters with docstrings (pythonGH-127310) (cherry picked from commit 9949091) Co-authored-by: Peter Bierma <zintensitydev@gmail.com> Co-authored-by: Erlend E. Aasland <erlend@python.org>
|
GH-127431 is a backport of this pull request to the 3.13 branch. |
erlend-aasland
added a commit
that referenced
this pull request
Nov 30, 2024
srinivasreddy
pushed a commit
to srinivasreddy/cpython
that referenced
this pull request
Jan 8, 2025
…ith docstrings (python#127310) Co-authored-by: Erlend E. Aasland <erlend@python.org>
ebonnal
pushed a commit
to ebonnal/cpython
that referenced
this pull request
Jan 12, 2025
…ith docstrings (python#127310) Co-authored-by: Erlend E. Aasland <erlend@python.org>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Finally got enough connection to submit a PR 😄
Co-authored-by: Erlend E. Aasland erlend.aasland@protonmail.com