10000 bpo-43224: Implement PEP 646 grammar changes by mrahtz · Pull Request #31018 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-43224: Implement PEP 646 grammar changes #31018

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.

Sign up for GitHub

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

Merged
merged 17 commits into from
Mar 26, 2022
Merged

bpo-43224: Implement PEP 646 grammar changes #31018

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7ecb7ba
bpo-43224: Implement PEP 646 grammar changes
mrahtz Jan 30, 2022
c0531ec
Add tests for del
mrahtz Jan 30, 2022
479c175
Tweak news to better fit in with other PRs
mrahtz Jan 30, 2022
091ceeb
Move error cases into test_syntax
mrahtz Feb 13, 2022
f1c9c77
Add an extra failure test
mrahtz Feb 14, 2022
c8d2534
Add more tests combining slicing with starring
mrahtz Mar 17, 2022
5df1e97
Fix ast representation of slices combined with starring
mrahtz Mar 17, 2022
677a326
Fix broken test in test_unparse
mrahtz Mar 17, 2022
1543785
Add a check_src_roundtrip test for "a[1:2, *a]"
mrahtz Mar 17, 2022
e1ab6ea
fix whitespace (make patchcheck)
JelleZijlstra Mar 23, 2022
18e7fa7
Merge remote-tracking branch 'upstream/main' into pep646-grammar
JelleZijlstra Mar 23, 2022
72dd8b9
Add tests for AST changes
mrahtz Mar 24, 2022
80bb5fa
Fix C unpack
mrahtz Mar 24, 2022
fbfd5b1
Fix typing.get_type_hints on variadic annotation
mrahtz Mar 24, 2022
816098c
Fix typo
mrahtz Mar 24, 2022
8962d26
Remove debug print
mrahtz Mar 25, 2022
973e9cc
Fix potential shadowing in ForwardRef
mrahtz Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix C unpack
  • Loading branch information
@mrahtz
mrahtz committed Mar 24, 2022
commit 80bb5facc2a311dc9b0e54aa58b59c39344e78b5
20 changes: 18 additions & 2 deletions Lib/test/test_future.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,11 @@ def test_annotations(self):
eq("list[str]")
eq("dict[str, int]")
eq("set[str,]")
eq("tuple[()]")
eq("tuple[str, ...]")
eq("tuple[(str, *types)]")
eq("tuple[str, *types]")
eq("tuple[str, int, (str, int)]")
eq("tuple[(*int, str, str, (str, int))]")
eq("tuple[*int, str, str, (str, int)]")
eq("tuple[str, int, float, dict[str, int]]")
eq("slice[0]")
eq("slice[0:1]")
Expand All @@ -305,6 +306,21 @@ def test_annotations(self):
eq("slice[1:2, 1]")
eq("slice[1:2, 2, 3]")
eq("slice[()]")
# Note that `slice[*Ts]`, `slice[*Ts,]`, and `slice[(*Ts,)]` all have
# the same AST, but only `slice[*Ts,]` passes this test, because that's
# what the unparser produces.
eq("slice[*Ts,]")
eq("slice[1, *Ts]")
eq("slice[*Ts, 2]")
eq("slice[1, *Ts, 2]")
eq("slice[*Ts, *Ts]")
eq("slice[1, *Ts, *Ts]")
eq("slice[*Ts, 1, *Ts]")
eq("slice[*Ts, *Ts, 1]")
eq("slice[1, *Ts, *Ts, 2]")
eq("slice[1:2, *Ts]")
eq("slice[*Ts, 1:2]")
eq("slice[1:2, *Ts, 3:4]")
eq("slice[a, b:c, d:e:f]")
eq("slice[(x for x in a)]")
eq('str or None if sys.version_info[0] > (3,) else str or bytes or None')
Expand Down
13 changes: 1 addition & 12 deletions Python/ast_unparse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,19 +786,8 @@ static int
append_ast_subscript(_PyUnicodeWriter *writer, expr_ty e)
{
APPEND_EXPR(e->v.Subscript.value, PR_ATOM);
int level = PR_TUPLE;
expr_ty slice = e->v.Subscript.slice;
if (slice->kind == Tuple_kind) {
for (Py_ssize_t i = 0; i < asdl_seq_LEN(slice->v.Tuple.elts); i++) {
expr_ty element = asdl_seq_GET(slice->v.Tuple.elts, i);
if (element->kind == Starred_kind) {
++level;
break;
}
}
}
APPEND_STR("[");
APPEND_EXPR(e->v.Subscript.slice, level);
APPEND_EXPR(e->v.Subscript.slice, PR_TUPLE);
APPEND_STR_FINISH("]");
}

Expand Down
0