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

Support py38-style starred expressions in return statement #1121

Merged
merged 5 commits into from Jan 18, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions blib2to3/Grammar.txt
Expand Up @@ -89,7 +89,7 @@ pass_stmt: 'pass'
flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt
break_stmt: 'break'
continue_stmt: 'continue'
return_stmt: 'return' [testlist]
return_stmt: 'return' [testlist_star_expr]
yield_stmt: yield_expr
raise_stmt: 'raise' [test ['from' test | ',' test [',' test]]]
import_stmt: import_name | import_from
Expand Down Expand Up @@ -212,4 +212,4 @@ testlist1: test (',' test)*
encoding_decl: NAME

yield_expr: 'yield' [yield_arg]
yield_arg: 'from' test | testlist
yield_arg: 'from' test | testlist_star_expr
27 changes: 27 additions & 0 deletions tests/data/python38.py
@@ -0,0 +1,27 @@
#!/usr/bin/env python3.8


def starred_return():
my_list = ["value2", "value3"]
return "value1", *my_list


def starred_yield():
my_list = ["value2", "value3"]
yield "value1", *my_list


# output


#!/usr/bin/env python3.8


def starred_return():
my_list = ["value2", "value3"]
return "value1", *my_list


def starred_yield():
my_list = ["value2", "value3"]
yield "value1", *my_list
12 changes: 4 additions & 8 deletions tests/test_black.py
Expand Up @@ -584,19 +584,15 @@ def test_async_as_identifier(self) -> None:
self.invokeBlack([str(source_path), "--target-version", "py37"], exit_code=123)

@patch("black.dump_to_file", dump_to_stderr)
def test_python37(self) -> None:
vemel marked this conversation as resolved.
Show resolved Hide resolved
source_path = (THIS_DIR / "data" / "python37.py").resolve()
source, expected = read_data("python37")
def test_python38(self) -> None:
source_path = (THIS_DIR / "data" / "python38.py").resolve()
source, expected = read_data("python38")
actual = fs(source)
self.assertFormatEqual(expected, actual)
major, minor = sys.version_info[:2]
if major > 3 or (major == 3 and minor >= 7):
if major > 3 or (major == 3 and minor >= 8):
black.assert_equivalent(source, actual)
black.assert_stable(source, actual, black.FileMode())
# ensure black can parse this when the target is 3.7
self.invokeBlack([str(source_path), "--target-version", "py37"])
# but not on 3.6, because we use async as a reserved keyword
self.invokeBlack([str(source_path), "--target-version", "py36"], exit_code=123)

@patch("black.dump_to_file", dump_to_stderr)
def test_fmtonoff(self) -> None:
Expand Down