Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-128083: Fix macro redefinition warning in clinic. #127950

Merged
merged 4 commits into from
Dec 19, 2024

Conversation

ZeroIntensity
Copy link
Member

@ZeroIntensity ZeroIntensity commented Dec 14, 2024

Apparently, gh-127341 wasn't the only issue with getters and setters in clinic. If you define a setter first, then the getter doesn't #undef the docstring accordingly.

@ZeroIntensity ZeroIntensity changed the title Fix macro redefinition warning in clinic. gh-128083: Fix macro redefinition warning in clinic. Dec 18, 2024
@encukou encukou merged commit b5d1e45 into python:main Dec 19, 2024
55 checks passed
@miss-islington-app
Copy link

Thanks @ZeroIntensity for the PR, and @encukou for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry, @ZeroIntensity and @encukou, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker b5d1e4552f0ba40d8380368e1b099261686a89cf 3.13

@ZeroIntensity
Copy link
Member Author

I'll backport this manually later today. Thanks!

ZeroIntensity added a commit to ZeroIntensity/cpython that referenced this pull request Dec 19, 2024
@bedevere-app
Copy link

bedevere-app bot commented Dec 19, 2024

GH-128102 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Dec 19, 2024
@ZeroIntensity ZeroIntensity deleted the clinic-getset-order branch December 19, 2024 21:07
erlend-aasland pushed a commit that referenced this pull request Dec 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants