bpo-32117: Allow tuple unpacking in return and yield statements by dacut · Pull Request #4509 · python/cpython · GitHub
Skip to content

bpo-32117: Allow tuple unpacking in return and yield statements - #4509

Merged
gvanrossum merged 6 commits into
python:masterfrom
dacut:master
Sep 22, 2018
Merged

bpo-32117: Allow tuple unpacking in return and yield statements#4509
gvanrossum merged 6 commits into
python:masterfrom
dacut:master

Conversation

@dacut

@dacut dacut commented Nov 22, 2017 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

This is a fix for issue 32117:

This stems from a query on StackOverflow.

Specifically, the following syntax is allowed:

def f():
    rest = (4, 5, 6)
    t = 1, 2, 3, *rest

While the following result in SyntaxError:

def g():
    rest = (4, 5, 6)
    return 1, 2, 3, *rest

def h():
    rest = (4, 5, 6)
    yield 1, 2, 3, *rest

Looking at the original commit that enabled tuple unpacking in assignment statements:
4905e80

I don't believe this difference is intentional.

https://bugs.python.org/issue32117

@the-knights-who-say-ni

the-knights-who-say-ni commented Nov 22, 2017

Copy link
Copy Markdown

@dacut dacut changed the title Allow tuple unpacking in return and yield statements Allow tuple unpacking in return and yield statements bpo-32117 Nov 22, 2017
@dacut

dacut commented Nov 22, 2017

Copy link
Copy Markdown
Contributor Author

CLA signed and awaiting review.

@dacut

dacut commented Nov 29, 2017

Copy link
Copy Markdown
Contributor Author

CLA reviewed and approved.

@serhiy-storchaka serhiy-storchaka changed the title Allow tuple unpacking in return and yield statements bpo-32117 bpo-32117: Allow tuple unpacking in return and yield statements Mar 26, 2018
@serhiy-storchaka serhiy-storchaka added the type-feature A feature request or enhancement label Mar 26, 2018
@gvanrossum

gvanrossum commented Sep 14, 2018

Copy link
Copy Markdown
Member

I'm going to close and reopen to cause Travis-CI and AppVeyor to rerun the tests.

@gvanrossum gvanrossum closed this Sep 14, 2018
@gvanrossum gvanrossum reopened this Sep 14, 2018
gvanrossum
gvanrossum reviewed Sep 15, 2018
View reviewed changes

@gvanrossum gvanrossum 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.

Assuming @dacut is no longer interested in this PR. Jordan Chapman, can you add the test I requested and rebase, then push?

Comment thread Lib/test/test_grammar.py
def g(): f((yield from ()))
def g(): f((yield from ()), 1)
# Do not require parenthesis for tuple unpacking
def g(): rest = 4, 5, 6; yield 1, 2, 3, *rest

@gvanrossum gvanrossum Sep 15, 2018

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.

I would add another test here to validate that this works, e.g. self.assertEqual(list(g()), [(1, 2, 3, 4, 5, 6)]).

@jChapman jChapman Sep 16, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I was tempted to do self.assertEqual(*g(), (1, 2, 3, 4, 5, 6)), but I think we're testing enough unpacking

@dacut

dacut commented Sep 16, 2018

Copy link
Copy Markdown
Contributor Author

I am. :-) I'll add that test if Jordan doesn't beat me to it.

@jChapman

jChapman commented Sep 16, 2018

Copy link
Copy Markdown
Contributor

I've added the test to my fork (https://github.com/jChapman/cpython) and rebased, but I don't have the ability to modify this pull request, so I am unsure how to proceed.

@gvanrossum

gvanrossum commented Sep 17, 2018

Copy link
Copy Markdown
Member

Also, I checked that CLA from @jChapman was received so I'll change those labels. I'll probably wait a day before merging, in case another core dev wants to have a look and/or say.

@gvanrossum
gvanrossum requested review from emilyemorehouse and removed request for a team, asvetlov, ericvsmith, gpshead, ilevkivskyi, ncoghlan, rhettinger and skrah September 17, 2018 16:01
@jChapman

jChapman commented Sep 21, 2018

Copy link
Copy Markdown
Contributor

@gvanrossum Reminder to complete merge (it has now been 4 days)

@brettcannon

brettcannon commented Sep 21, 2018

Copy link
Copy Markdown
Member

Merge unpacking return value support

@gvanrossum

gvanrossum commented Sep 21, 2018

Copy link
Copy Markdown
Member

@brettcannon What's that trello.com link? I get "Card not found".

@brettcannon

brettcannon commented Sep 21, 2018

Copy link
Copy Markdown
Member

I touched up the news entry slightly (made sure to thank @dacut and @jChapman 😄 ). If @gvanrossum doesn't merge this by the time I do my next sweep through my Python TODO list then I will.

@brettcannon

brettcannon commented Sep 21, 2018

Copy link
Copy Markdown
Member

@gvanrossum the Trello card is for my private board to keep track of my TODO entries; didn't realize it left a comment. :/

@gvanrossum

gvanrossum commented Sep 22, 2018

Copy link
Copy Markdown
Member

I see no reason to hold this up. Thanks @dacut for the fix and @jChapman for pinging this!

@gvanrossum
gvanrossum merged commit fd97d1f into python:master Sep 22, 2018
@gvanrossum

gvanrossum commented Sep 22, 2018

Copy link
Copy Markdown
Member

@jChapman jChapman mentioned this pull request Sep 22, 2018
Merged
terryjreedy pushed a commit to terryjreedy/cpython that referenced this pull request Sep 23, 2018
@jChapman @miss-islington
bpo-32117: Iterable unpacking in return and yield documentation (pyth…
8fabae3 
…onGH-9487)

News entry clean up, added to what's new

Requested by @gvanrossum in python#4509 


https://bugs.python.org/issue32117
@gvanrossum gvanrossum mentioned this pull request Oct 18, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gvanrossum gvanrossum gvanrossum approved these changes
@emilyemorehouse emilyemorehouse Awaiting requested review from emilyemorehouse
+1 more reviewer
@jChapman jChapman jChapman left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

type-feature A feature request or enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@dacut @the-knights-who-say-ni @gvanrossum @jChapman @brettcannon @serhiy-storchaka @Mariatta @bedevere-bot