diff options
| author | Thomas Wouters <thomas@python.org> | 2006-02-28 16:09:29 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-02-28 16:09:29 (GMT) |
| commit | f7f438ba3b05eb4356e7511401686b07d9dfb6d8 (patch) | |
| tree | 94010633418aaf2ea19c609139f9499bf57a1058 /Python/graminit.c | |
| parent | d3188639c32a086e9149b92d875c45408bd8b81c (diff) | |
| download | cpython-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 'Python/graminit.c')
| -rw-r--r-- | Python/graminit.c | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/Python/graminit.c b/Python/graminit.c index c56d1a8..491b166 100644 --- a/Python/graminit.c +++ b/Python/graminit.c @@ -513,34 +513,45 @@ static arc arcs_26_0[1] = { {74, 1}, }; static arc arcs_26_1[2] = { - {75, 1}, - {12, 2}, + {75, 2}, + {12, 3}, }; -static arc arcs_26_2[1] = { - {72, 3}, +static arc arcs_26_2[3] = { + {75, 4}, + {12, 3}, + {72, 5}, }; -static arc arcs_26_3[3] = { - {28, 4}, - {13, 5}, - {76, 4}, +static arc arcs_26_3[1] = { + {72, 5}, }; -static arc arcs_26_4[1] = { - {0, 4}, +static arc arcs_26_4[2] = { + {75, 4}, + {12, 3}, }; -static arc arcs_26_5[1] = { +static arc arcs_26_5[3] = { + {28, 6}, + {13, 7}, {76, 6}, }; static arc arcs_26_6[1] = { - {15, 4}, + {0, 6}, +}; +static arc arcs_26_7[1] = { + {76, 8}, +}; +static arc arcs_26_8[1] = { + {15, 6}, }; -static state states_26[7] = { +static state states_26[9] = { {1, arcs_26_0}, {2, arcs_26_1}, - {1, arcs_26_2}, - {3, arcs_26_3}, - {1, arcs_26_4}, - {1, arcs_26_5}, + {3, arcs_26_2}, + {1, arcs_26_3}, + {2, arcs_26_4}, + {3, arcs_26_5}, {1, arcs_26_6}, + {1, arcs_26_7}, + {1, arcs_26_8}, }; static arc arcs_27_0[1] = { {19, 1}, @@ -1825,7 +1836,7 @@ static dfa dfas[84] = { "\000\000\000\000\000\000\000\000\000\005\000\000\000\000\000\000\000\000\000\000\000"}, {281, "import_name", 0, 3, states_25, "\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000"}, - {282, "import_from", 0, 7, states_26, + {282, "import_from", 0, 9, states_26, "\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000"}, {283, "import_as_name", 0, 4, states_27, "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, |