bpo-46581: Propagate private vars via _GenericAlias.copy_with by posita · Pull Request #31061 · python/cpython

posita · 2022-02-01T17:07:48Z

GH-26091 added the _typevar_types and _paramspec_tvars instance variables to _GenericAlias. However, they were not propagated consistently. This commit addresses the most prominent deficiency identified in bpo-46581 (namely their absence from _GenericAlias.copy_with), but there could be others.

https://bugs.python.org/issue46581

posita · 2022-02-19T05:51:21Z

~~Ah! Crap. Sorry for the force-push that moved us backward. Let me rebase and push again….~~Should be cleaned up now. Apologies for the distraction!

Requested [here](python#31061 (comment)).

) (cherry picked from commit 2031149) Co-authored-by: Matt Bogosian <eb3f73+github+com@yaymail.com>

(cherry picked from commit 2031149) Co-authored-by: Matt Bogosian <eb3f73+github+com@yaymail.com>

serhiy-storchaka

There is more straightforward way to fix a conflict.

Add _typevar_types=(TypeVar, ParamSpec), _paramspec_tvars=True to the call of _ConcatenateGenericAlias in _Concatenate.
Remove _ConcatenateGenericAlias.__initt__.
Remove a special case from _GenericAlias.copy_with.

Also please move changes in comments and docstrings to enother PR. They distract.

bedevere-bot · 2022-03-06T14:48:01Z

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.

JelleZijlstra · 2022-03-10T04:53:20Z

+ original = Callable[P, int]
+ self.assertEqual(original.__parameters__, (P,))
+ copied = original[P]
+ self.assertEqual(original.__parameters__, copied.__parameters__)


Could you add some more complicated test cases? Ideas:
The original has a Concatenate[int, P] in it (original = Callable[Concatenate[int, P], int]; original[P].__paramaters__ == (P,))
Instead of substituting a P in, substitute in a Concatenate or something like [int, T], and then the T should be in __parameters__.

serhiy-storchaka · 2022-03-10T13:17:33Z

+ P2 = ParamSpec('P2')
+ C1 = Callable[P, int]
+ self.assertEqual(C1.__parameters__, (P,))
+ self.assertEqual(C1[P2].__parameters__, (P2,))


Only this test was failed.

Fidget-Spinner

Thank you for pulling through @posita . This was a pretty tricky PR.

miss-islington · 2022-03-10T14:42:19Z

Thanks @posita for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

miss-islington · 2022-03-10T14:42:35Z

Sorry, @posita and @serhiy-storchaka, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 32bf3597922ac3f613989582afa2bff43bea8a2f 3.10

posita · 2022-03-10T20:01:08Z

Sorry, @posita and @serhiy-storchaka, I could not cleanly backport this to 3.10 due to a conflict. Please backport using cherry_picker on command line. cherry_picker 32bf3597922ac3f613989582afa2bff43bea8a2f 3.10

Should I work on resolving this?

JelleZijlstra · 2022-03-10T20:02:09Z

Yes please :) Let me know if you need any help.

posita · 2022-03-11T13:30:22Z

I would love a nudge on where to learn how to do this manually. (I'm unfamiliar with the process.) Is it as simple as resolving any conflicts against the 3.10 branch and then submitting a PR or is there more involved?

Fidget-Spinner · 2022-03-11T13:34:34Z

I would love a nudge on where to learn how to do this manually. (I'm unfamiliar with the process.) Is it as simple as resolving any conflicts against the 3.10 branch and then submitting a PR or is there more involved?

Yup. Submit a PR against the 3.10 and/or 3.9 branch after resolving conflicts.

The bot is a little off. An easier way without installing things is to use the git cherry-pick command directly. StackOverflow link here does a great job explaining it.

The other even easier alternative if you're using GitHub desktop, is to drag and drop the commit from the left panel from main into your new branch that is based off 3.10/3.9. The app will then warn you about conflicts, and you can resolve them in a code editor (this means accepting/rejecting changes or overwriting them altogether manually).

…ythonGH-31061) (Cherry-picked from 32bf359.) pythonGH-26091 added the _typevar_types and _paramspec_tvars instance variables to _GenericAlias. However, they were not propagated consistently. This commit addresses the most prominent deficiency identified in bpo-46581 (namely their absence from _GenericAlias.copy_with), but there could be others. Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com> Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

bedevere-bot · 2022-03-11T13:58:43Z

GH-31821 is a backport of this pull request to the 3.10 branch.

posita · 2022-03-11T14:10:50Z

I would love a nudge on where to learn how to do this manually. (I'm unfamiliar with the process.) Is it as simple as resolving any conflicts against the 3.10 branch and then submitting a PR or is there more involved?
Yup. Submit a PR against the 3.10 and/or 3.9 branch after resolving conflicts.
…

Thanks @Fidget-Spinner! Cherry-picking is all good. I just didn't know if there was other repo- or CI-specific magical incantations I needed to invoke or procedures I needed to follow.

Question (maybe for @JelleZijlstra): This is marked as needed a back-port to 3.10, but not to 3.9. Should this also be back-ported to 3.9?

…H-31061) (GH-31821) (Cherry-picked from 32bf359.) GH-26091 added the _typevar_types and _paramspec_tvars instance variables to _GenericAlias. However, they were not propagated consistently. This commit addresses the most prominent deficiency identified in bpo-46581 (namely their absence from _GenericAlias.copy_with), but there could be others. Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com> Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com> Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Fidget-Spinner · 2022-03-11T15:17:55Z

@posita re backporting to 3.9, we don't need it as pre-3.10 ParamSpec didn't exist so we never needed these parameters then.

Anyways, congrats on becoming a CPython contributor!

posita · 2022-03-11T15:37:29Z

@posita re backporting to 3.9, we don't need it as pre-3.10 ParamSpec didn't exist so we never needed these parameters then.

Oh, right! Duh. Thanks all! I very much appreciate all the hand-holding.

) (cherry picked from commit 2031149) Co-authored-by: Matt Bogosian <eb3f73+github+com@yaymail.com>

posita requested review from Fidget-Spinner and gvanrossum as code owners February 1, 2022 17:07

the-knights-who-say-ni added the CLA signed label Feb 1, 2022

bedevere-bot added the awaiting review label Feb 1, 2022

posita commented Feb 1, 2022
View reviewed changes

Comment threadLib/typing.py Outdated
Comment threadLib/typing.py Outdated

posita force-pushed the posita/0/fix-bpo-46581-generic-alias branch from ebe8d33 to ae11f6fCompare February 1, 2022 17:33

posita mentioned this pull request Feb 1, 2022
Initial attempt a caching protocol implementation beartype/beartype#86
Merged

leycec mentioned this pull request Feb 10, 2022
The Future Sound of Beartype: Going Deep on Type-checking beartype/beartype#7
Closed

JelleZijlstra reviewed Feb 19, 2022
View reviewed changes

Comment threadLib/test/test_genericalias.py Outdated

JelleZijlstra self-assigned this Feb 19, 2022

posita force-pushed the posita/0/fix-bpo-46581-generic-alias branch from 90d730e to ae11f6fCompare February 19, 2022 05:47

posita force-pushed the posita/0/fix-bpo-46581-generic-alias branch from ae11f6f to 4efbc2cCompare February 19, 2022 05:55

posita force-pushed the posita/0/fix-bpo-46581-generic-alias branch from 4efbc2c to 7b9a6ffCompare February 26, 2022 19:34

posita commented Mar 1, 2022
View reviewed changes

Comment threadLib/typing.py Outdated

posita added a commit to posita/cpython that referenced this pull request Mar 4, 2022
Copy edits frompython#31061
80b8461
Requested [here](python#31061 (comment)).

posita mentioned this pull request Mar 4, 2022
Lib/typing.py copy edits originating from GH-31061 #31684
Merged

posita force-pushed the posita/0/fix-bpo-46581-generic-alias branch from 7b9a6ff to 9510c95Compare March 4, 2022 15:05

Fidget-Spinner pushed a commit that referenced this pull request Mar 5, 2022
Lib/typing.py copy edits originating fromGH-31061(#31684)
2031149

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 5, 2022
Lib/typing.py copy edits originating frompythonGH-31061(pythonGH-31684
11b5a05
) (cherry picked from commit 2031149) Co-authored-by: Matt Bogosian <eb3f73+github+com@yaymail.com>

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 5, 2022
Lib/typing.py copy edits originating frompythonGH-31061(pythonGH-31684
dded3ed
) (cherry picked from commit 2031149) Co-authored-by: Matt Bogosian <eb3f73+github+com@yaymail.com>

miss-islington added a commit that referenced this pull request Mar 5, 2022
Lib/typing.py copy edits originating fromGH-31061(GH-31684)
4716f70
(cherry picked from commit 2031149) Co-authored-by: Matt Bogosian <eb3f73+github+com@yaymail.com>

miss-islington added a commit that referenced this pull request Mar 5, 2022
Lib/typing.py copy edits originating fromGH-31061(GH-31684)
7fba55f
(cherry picked from commit 2031149) Co-authored-by: Matt Bogosian <eb3f73+github+com@yaymail.com>

posita mentioned this pull request Mar 5, 2022
Ruh-roh! CACHING protocols? More like CRASHING protocols (in 3.7)! Amirite? beartype/beartype#109
Closed

Fidget-Spinner reviewed Mar 6, 2022
View reviewed changes

Comment threadLib/typing.py Outdated

posita force-pushed the posita/0/fix-bpo-46581-generic-alias branch from ba8b094 to c9def58Compare March 6, 2022 14:10

serhiy-storchaka requested changes Mar 6, 2022
View reviewed changes

Comment threadMisc/NEWS.d/next/Library/2022-02-01-11-32-47.bpo-46581.t7Zw65.rst Outdated

bedevere-bot added awaiting changes and removed awaiting review labels Mar 6, 2022

posita force-pushed the posita/0/fix-bpo-46581-generic-alias branch from 72b9e76 to 6bf1f6cCompare March 10, 2022 00:10

Move test to ParamSpecTests
6db57f5

posita force-pushed the posita/0/fix-bpo-46581-generic-alias branch from 6bf1f6c to 6db57f5Compare March 10, 2022 00:11

JelleZijlstra reviewed Mar 10, 2022
View reviewed changes

serhiy-storchaka reviewed Mar 10, 2022
View reviewed changes

Comment threadLib/test/test_typing.py Outdated

Update Lib/test/test_typing.py
031c617

serhiy-storchaka reviewed Mar 10, 2022
View reviewed changes

serhiy-storchaka approved these changes Mar 10, 2022
View reviewed changes

Fidget-Spinner approved these changes Mar 10, 2022
View reviewed changes

serhiy-storchaka merged commit 32bf359 into python:mainMar 10, 2022

bedevere-bot removed the awaiting merge label Mar 10, 2022

miss-islington assigned serhiy-storchaka and unassigned JelleZijlstra Mar 10, 2022

posita deleted the posita/0/fix-bpo-46581-generic-alias branch March 11, 2022 13:53

bedevere-bot removed the needs backport to 3.10 only security fixes label Mar 11, 2022

serhiy-storchaka removed their assignment Apr 25, 2022

hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
Lib/typing.py copy edits originating frompythonGH-31061(pythonGH-31684
b788a2f
) (cherry picked from commit 2031149) Co-authored-by: Matt Bogosian <eb3f73+github+com@yaymail.com>

Uh oh!

Uh oh!

Conversation

posita commented Feb 1, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

posita commented Feb 19, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bedevere-bot commented Mar 6, 2022

Uh oh!

JelleZijlstraMar 10, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

serhiy-storchakaMar 10, 2022

Choose a reason for hiding this comment

Uh oh!

Fidget-Spinner left a comment

Choose a reason for hiding this comment

Uh oh!

miss-islington commented Mar 10, 2022

Uh oh!

miss-islington commented Mar 10, 2022

Uh oh!

posita commented Mar 10, 2022

Uh oh!

JelleZijlstra commented Mar 10, 2022

Uh oh!

posita commented Mar 11, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Fidget-Spinner commented Mar 11, 2022

Uh oh!

bedevere-bot commented Mar 11, 2022

Uh oh!

posita commented Mar 11, 2022

Uh oh!

Fidget-Spinner commented Mar 11, 2022

Uh oh!

posita commented Mar 11, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

posita commented Feb 1, 2022•
edited
Loading

posita commented Feb 19, 2022•
edited
Loading

posita commented Mar 11, 2022•
edited
Loading