Skip to content

[3.10] gh-94192: Fix error for dictionary literals with invalid expression as value. (GH-94304) #94344

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
pablogsal merged 1 commit into from
Jun 27, 2022
+297 −221
Merged

[3.10] gh-94192: Fix error for dictionary literals with invalid expression as value. (GH-94304) #94344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,4 +1031,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 ':'") }
16 changes: 13 additions & 3 deletions Lib/test/test_syntax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,12 +970,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 Expand Up @@ -1508,8 +1518,8 @@ def fib(n):
self.assertEqual(compile(s1, '<string>', 'exec'), compile(s2, '<string>', 'exec'))
except SyntaxError:
self.fail("Indented statement over multiple lines is valid")
def test_continuation_bad_indentation(self):

def test_continuation_bad_indentation(self):
# Check that code that breaks indentation across multiple lines raises a syntax error

code = r"""\
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-06-26-14-37-03.gh-issue-94192.ab7tn7.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix error for dictionary literals with invalid expression as value.
Loading