summaryrefslogtreecommitdiffstats
path: root/Grammar
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2007-03-19 18:56:50 (GMT)
committerGeorg Brandl <georg@python.org>2007-03-19 18:56:50 (GMT)
commite66c8c7c127370ab7d0055f98053caad48cbc135 (patch)
treef1b0cd053c45a78dc652c833815ea47a4bc94e7d /Grammar
parentd16e81aabe5448a90640694d57cdaefddf3a1a9f (diff)
downloadcpython-e66c8c7c127370ab7d0055f98053caad48cbc135.zip
cpython-e66c8c7c127370ab7d0055f98053caad48cbc135.tar.gz
cpython-e66c8c7c127370ab7d0055f98053caad48cbc135.tar.bz2
"from ... import x" should not be a syntax error... make
import_stmt accept ELLIPSes and DOTs.
Diffstat (limited to 'Grammar')
-rw-r--r--Grammar/Grammar3
1 files changed, 2 insertions, 1 deletions
diff --git a/Grammar/Grammar b/Grammar/Grammar
index e4cd3e0..41d8be8 100644
--- a/Grammar/Grammar
+++ b/Grammar/Grammar
@@ -55,7 +55,8 @@ yield_stmt: yield_expr
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]