diff options
| author | Thomas Wouters <thomas@python.org> | 2000-08-17 22:55:00 +0000 |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2000-08-17 22:55:00 +0000 |
| commit | 5215225ea1e3200b572775639d567f5e3f489a15 (patch) | |
| tree | 8202d4aebf513dc8c8a80adf018f13270386e658 /Grammar | |
| parent | 1d75a79c009e500923128716a02efbe86135e64e (diff) | |
| download | cpython-git-5215225ea1e3200b572775639d567f5e3f489a15.tar.gz | |
Apply SF patch #101135, adding 'import module as m' and 'from module import
name as n'. By doing some twists and turns, "as" is not a reserved word.
There is a slight change in semantics for 'from module import name' (it will
now honour the 'global' keyword) but only in cases that are explicitly
undocumented.
Diffstat (limited to 'Grammar')
| -rw-r--r-- | Grammar/Grammar | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Grammar/Grammar b/Grammar/Grammar index 872ec81b6d..02e2edd0ce 100644 --- a/Grammar/Grammar +++ b/Grammar/Grammar @@ -41,7 +41,9 @@ break_stmt: 'break' continue_stmt: 'continue' return_stmt: 'return' [testlist] raise_stmt: 'raise' [test [',' test [',' test]]] -import_stmt: 'import' dotted_name (',' dotted_name)* | 'from' dotted_name 'import' ('*' | NAME (',' NAME)*) +import_stmt: 'import' dotted_as_name (',' dotted_as_name)* | 'from' dotted_name 'import' ('*' | import_as_name (',' import_as_name)*) +import_as_name: NAME [NAME NAME] +dotted_as_name: dotted_name [NAME NAME] dotted_name: NAME ('.' NAME)* global_stmt: 'global' NAME (',' NAME)* #access_stmt: 'access' ('*' | NAME (',' NAME)*) ':' accesstype (',' accesstype)* |