Skip to content

bpo-40663: Correctly generate annotations for subscripts - #20156

Merged
pablogsal merged 1 commit into
python:masterfrom
isidentical:bpo-40663
May 18, 2020
Merged

bpo-40663: Correctly generate annotations for subscripts#20156
pablogsal merged 1 commit into
python:masterfrom
isidentical:bpo-40663

Conversation

@isidentical

@isidenticalisidentical commented May 17, 2020•
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

pablogsal
pablogsal reviewed May 18, 2020
View reviewed changes
Comment threadLib/test/test_future.py
eq("set[str,]")
eq("tuple[str, ...]")
eq("tuple[(str, *types)]")
eq("tuple[str, int, (str, int)]")

@pablogsalpablogsalMay 18, 2020•
edited
Loading

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.

This case was passing before. Did you meant tuple[str, int, *(str, int)]?

@isidenticalisidenticalMay 18, 2020

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.

It is for validating tuples have parens when they are inside of another tuple with different precedence.

@pablogsal
pablogsal merged commit 2135e10 into python:masterMay 18, 2020
@miss-islington

miss-islington commented May 18, 2020

Copy link
Copy Markdown
Contributor

Thanks @isidentical for the PR, and @pablogsal for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington

miss-islington commented May 18, 2020

Copy link
Copy Markdown
Contributor

Sorry, @isidentical and @pablogsal, I could not cleanly backport this to 3.8 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 2135e10dc717c00d10d899d232bebfc59bb25032 3.8

@miss-islington

miss-islington commented May 18, 2020

Copy link
Copy Markdown
Contributor

Sorry @isidentical and @pablogsal, I had trouble checking out the 3.7 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 2135e10dc717c00d10d899d232bebfc59bb25032 3.7

@isidentical

isidentical commented May 18, 2020

Copy link
Copy Markdown
MemberAuthor

I'll create backport PRs myself

isidentical added a commit to isidentical/cpython that referenced this pull request May 18, 2020
@isidentical
[3.8] bpo-40663: Correctly handle annotations with subscripts in ast_…
d9dd1a1
…unparse.c (pythonGH-20156).
(cherry picked from commit 2135e10)
Co-authored-by: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
@isidenticalisidentical mentioned this pull request May 18, 2020
Merged
@bedevere-bot

bedevere-bot commented May 18, 2020

Copy link
Copy Markdown

GH-20191 is a backport of this pull request to the 3.8 branch.

isidentical added a commit to isidentical/cpython that referenced this pull request May 18, 2020
@isidentical
[3.7] bpo-40663: Correctly handle annotations with subscripts in ast_…
ae0c16e
…unparse.c (pythonGH-20156).
(cherry picked from commit 2135e10)
Co-authored-by: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
@isidenticalisidentical mentioned this pull request May 18, 2020
Merged
@bedevere-bot

bedevere-bot commented May 18, 2020

Copy link
Copy Markdown

GH-20192 is a backport of this pull request to the 3.7 branch.

@miss-islington

miss-islington commented May 22, 2020

Copy link
Copy Markdown
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 22, 2020
@isidentical@miss-islington
bpo-40663: Correctly handle annotations with subscripts in ast_unpars…
7a13f80
…e.c (pythonGH-20156)
(cherry picked from commit 2135e10)
Co-authored-by: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
@bedevere-bot

bedevere-bot commented May 22, 2020

Copy link
Copy Markdown

GH-20324 is a backport of this pull request to the 3.9 branch.

pablogsal pushed a commit that referenced this pull request May 22, 2020
@isidentical
[3.7]bpo-40663: Correctly handle annotations with subscripts in ast_…
4330014
…unparse.c (GH-20156). (GH-20192)
(cherry picked from commit 2135e10)
Co-authored-by: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
pablogsal pushed a commit that referenced this pull request May 22, 2020
@isidentical
[3.8]bpo-40663: Correctly handle annotations with subscripts in ast_…
a4d219b
…unparse.c (GH-20156). (GH-20191)
(cherry picked from commit 2135e10)
Co-authored-by: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
arturoescaip pushed a commit to arturoescaip/cpython that referenced this pull request May 24, 2020
@isidentical@arturoescaip
bpo-40663: Correctly handle annotations with subscripts in ast_unpars…
b7955e6
…e.c (pythonGH-20156)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pablogsalpablogsalpablogsal approved these changes
@serhiy-storchakaserhiy-storchakaAwaiting requested review from serhiy-storchaka

Assignees

@pablogsalpablogsal

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@isidentical@miss-islington@bedevere-bot@pablogsal@the-knights-who-say-ni