Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Grammar/python.gram
Original file line number Diff line number Diff line change
Expand Up @@ -1314,4 +1314,4 @@ invalid_kvpair:
| a=expression !(':') {
RAISE_ERROR_KNOWN_LOCATION(p, PyExc_SyntaxError, a->lineno, a->end_col_offset - 1, a->end_lineno, -1, "':' expected after dictionary key") }
| expression ':' a='*' bitwise_or { RAISE_SYNTAX_ERROR_STARTING_FROM(a, "cannot use a starred expression in a dictionary value") }
| expression a=':' {RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "expression expected after dictionary key and ':'") }
| expression a=':' &('}'|',') {RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "expression expected after dictionary key and ':'") }
12 changes: 11 additions & 1 deletion Lib/test/test_syntax.py
Original file line number Diff line number Diff line change
Expand Up @@ -1265,12 +1265,22 @@
Traceback (most recent call last):
SyntaxError: expression expected after dictionary key and ':'

# Ensure that the error is not raise for syntax errors that happen after sets
# Ensure that the error is not raised for syntax errors that happen after sets

>>> {1} $
Traceback (most recent call last):
SyntaxError: invalid syntax

# Ensure that the error is not raised for invalid expressions

>>> {1: 2, 3: foo(,), 4: 5}
Traceback (most recent call last):
SyntaxError: invalid syntax

>>> {1: $, 2: 3}
Traceback (most recent call last):
SyntaxError: invalid syntax

Specialized indentation errors:

>>> while condition:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix error for dictionary literals with invalid expression as value.
Loading