Exclude trailing invalid import targets

Author: brianschubert

Grammar/python.gram

@@ -1432,13 +1432,13 @@ invalid_import:
     | 'import' token=NEWLINE {
         RAISE_SYNTAX_ERROR_STARTING_FROM(token, "Expected one or more names after 'import'") }
 invalid_dotted_as_name:
-    | a=dotted_name b=['as' NAME] c=dotted_name {
+    | a=dotted_name b=['as' NAME] c=dotted_name ('as' | ',' | ')' | ';' | NEWLINE) {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(b ? (expr_ty) b : a, c, "expected comma between import clauses") }
     | dotted_name 'as' !(NAME (',' | ')' | ';' | NEWLINE)) a=expression {
         RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a,
             "cannot use %s as import target", _PyPegen_get_expr_name(a)) }
 invalid_import_from_as_name:
-    | [NAME 'as'] a=NAME b=NAME {
+    | [NAME 'as'] a=NAME b=NAME ('as' | ',' | ')' | ';' | NEWLINE) {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected comma between import clauses") }
     | NAME 'as' !(NAME (',' | ')' | ';' | NEWLINE)) a=expression {
         RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a,

Lib/test/test_syntax.py

@@ -2267,6 +2267,16 @@
 Traceback (most recent call last):
 SyntaxError: expected comma between import clauses
 
+# Check that we don't raise the "missing comma" error for invalid import targets.
+
+>>> import a b()
+Traceback (most recent call last):
+SyntaxError: invalid syntax
+
+>>> from x import a b[c]
+Traceback (most recent call last):
+SyntaxError: invalid syntax
+
 >>> (): int
 Traceback (most recent call last):
 SyntaxError: only single target (not tuple) can be annotated