summaryrefslogtreecommitdiffstats
path: root/Grammar
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2006-02-28 16:09:29 (GMT)
committerThomas Wouters <thomas@python.org>2006-02-28 16:09:29 (GMT)
commitf7f438ba3b05eb4356e7511401686b07d9dfb6d8 (patch)
tree94010633418aaf2ea19c609139f9499bf57a1058 /Grammar
parentd3188639c32a086e9149b92d875c45408bd8b81c (diff)
downloadcpython-f7f438ba3b05eb4356e7511401686b07d9dfb6d8.zip
cpython-f7f438ba3b05eb4356e7511401686b07d9dfb6d8.tar.gz
cpython-f7f438ba3b05eb4356e7511401686b07d9dfb6d8.tar.bz2
SF patch #1438387, PEP 328: relative and absolute imports.
- IMPORT_NAME takes an extra argument from the stack: the relativeness of the import. Only passed to __import__ when it's not -1. - __import__() takes an optional 5th argument for the same thing; it __defaults to -1 (old semantics: try relative, then absolute) - 'from . import name' imports name (be it module or regular attribute) from the current module's *package*. Likewise, 'from .module import name' will import name from a sibling to the current module. - Importing from outside a package is not allowed; 'from . import sys' in a toplevel module will not work, nor will 'from .. import sys' in a (single-level) package. - 'from __future__ import absolute_import' will turn on the new semantics for import and from-import: imports will be absolute, except for from-import with dots. Includes tests for regular imports and importhooks, parser changes and a NEWS item, but no compiler-package changes or documentation changes.
Diffstat (limited to 'Grammar')
-rw-r--r--Grammar/Grammar2
1 files changed, 1 insertions, 1 deletions
diff --git a/Grammar/Grammar b/Grammar/Grammar
index fd274fa..08c8a00 100644
--- a/Grammar/Grammar
+++ b/Grammar/Grammar
@@ -59,7 +59,7 @@ 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
+import_from: ('from' ('.'* dotted_name | '.')
'import' ('*' | '(' import_as_names ')' | import_as_names))
import_as_name: NAME [NAME NAME]
dotted_as_name: dotted_name [NAME NAME]