Skip to content

gh-103556: [inspect.Signature] disallow pos-or-kw params without default after pos-only with default - #103557

Merged
carljm merged 4 commits into
python:mainfrom
sobolevn:issue-103556
Apr 22, 2023
Merged

gh-103556: [inspect.Signature] disallow pos-or-kw params without default after pos-only with default#103557
carljm merged 4 commits into
python:mainfrom
sobolevn:issue-103556

Conversation

@sobolevn

@sobolevnsobolevn commented Apr 15, 2023•
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

I consider this a bug fix, not a new feature. So, backport to 3.11 should probably be done.

@bedevere-botbedevere-bot mentioned this pull request Apr 15, 2023
Closed
@sobolevn
sobolevn requested a review from carljmApril 15, 2023 09:47
@sobolevn

sobolevn commented Apr 15, 2023

Copy link
Copy Markdown
MemberAuthor

test_nntplib failure seems unrelated, but I cannot re-trigger Azure build.

sobolevn
sobolevn commented Apr 15, 2023
View reviewed changes
Comment threadLib/test/test_inspect.py Outdated
@sobolevn

sobolevn commented Apr 16, 2023

Copy link
Copy Markdown
MemberAuthor

@hauntsaninja if you are interested in this as well after #103554 I would be very grateful :)

carljm
carljm requested changes Apr 17, 2023
View reviewed changes

@carljmcarljm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for finding and fixing this!

I think the fix can be even simpler, though; see inline comment.

Comment threadLib/inspect.py Outdated
Comment on lines +3024 to +3029
if (top_kind != _POSITIONAL_ONLY
and kind != _POSITIONAL_OR_KEYWORD):
# We still have to maintain defaults in cases like
# def some(pod=42, /, pk=1): ...
# Here `pk` must have a default value.
kind_defaults = False

@carljmcarljmApr 17, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

non-default-after-default is only checked for _POSITIONAL_ONLY and _POSITIONAL_KEYWORD (see line 3032.) So if we want to keep the value of kind_defaults across the transition from PO to POK (which I do agree is correct and matches the parser behavior), then really we always want to keep it, and it is no longer kind_defaults but simply seen_default. So I think we can eliminate all of this, here's the full version I'd recommend (which passes all tests): https://gist.github.com/carljm/6779e601d04e0b1135444b4e0263e281

@sobolevnsobolevnApr 19, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I agree, thank you for the suggestion.

@bedevere-bot

bedevere-bot commented Apr 17, 2023

Copy link
Copy Markdown

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@sobolevn

sobolevn commented Apr 19, 2023

Copy link
Copy Markdown
MemberAuthor

I have made the requested changes; please review again

@bedevere-bot

bedevere-bot commented Apr 19, 2023

Copy link
Copy Markdown

Thanks for making the requested changes!

@carljm: please review the changes made to this pull request.

@carljmcarljm added the needs backport to 3.11 only security fixes label Apr 22, 2023
@carljm
carljm merged commit 6b58d41 into python:mainApr 22, 2023
@miss-islington

miss-islington commented Apr 22, 2023

Copy link
Copy Markdown
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 22, 2023
@sobolevn@miss-islington
pythongh-103556: [inspect.Signature] disallow pos-or-kw params withou…
c38b670
…t default after pos-only with default (pythonGH-103557)
(cherry picked from commit 6b58d41)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
@bedevere-bot

bedevere-bot commented Apr 22, 2023

Copy link
Copy Markdown

GH-103675 is a backport of this pull request to the 3.11 branch.

@bedevere-botbedevere-bot removed the needs backport to 3.11 only security fixes label Apr 22, 2023
carljm pushed a commit that referenced this pull request Apr 22, 2023
@miss-islington
[3.11]gh-103556: [inspect.Signature] disallow pos-or-kw params witho…
b2fdae9
…ut default after pos-only with default (GH-103557) (#103675)
@zhiruiluozhiruiluo mentioned this pull request Jul 5, 2023
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@carljmcarljmcarljm approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sobolevn@bedevere-bot@miss-islington@carljm