"from ... import x" should not be a syntax error... make
import_stmt accept ELLIPSes and DOTs.
diff --git a/Grammar/Grammar b/Grammar/Grammar
index e4cd3e0..41d8be8 100644
--- a/Grammar/Grammar
+++ b/Grammar/Grammar
@@ -55,7 +55,8 @@
raise_stmt: 'raise' [test [',' test [',' test]]]
import_stmt: import_name | import_from
import_name: 'import' dotted_as_names
-import_from: ('from' ('.'* dotted_name | '.'+)
+# note below: the ('.' | '...') is necessary because '...' is tokenized as ELLIPSIS
+import_from: ('from' (('.' | '...')* dotted_name | ('.' | '...')+)
'import' ('*' | '(' import_as_names ')' | import_as_names))
import_as_name: NAME ['as' NAME]
dotted_as_name: dotted_name ['as' NAME]
diff --git a/Python/ast.c b/Python/ast.c
index 8180b42..777c00e 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -2406,8 +2406,8 @@
/*
import_stmt: import_name | import_from
import_name: 'import' dotted_as_names
- import_from: 'from' ('.'* dotted_name | '.') 'import'
- ('*' | '(' import_as_names ')' | import_as_names)
+ import_from: 'from' (('.' | '...')* dotted_name | ('.' | '...')+)
+ 'import' ('*' | '(' import_as_names ')' | import_as_names)
*/
int lineno;
int col_offset;
@@ -2445,6 +2445,10 @@
mod = alias_for_import_name(c, CHILD(n, idx));
idx++;
break;
+ } else if (TYPE(CHILD(n, idx)) == ELLIPSIS) {
+ /* three consecutive dots are tokenized as one ELLIPSIS */
+ ndots += 3;
+ continue;
} else if (TYPE(CHILD(n, idx)) != DOT) {
break;
}