Mercurial > cpython-lru_cache-weakref

diff Python/graminit.c @ 36712:5c36c222e7ca legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Thomas Wouters <thomas@python.org>
date Tue, 28 Feb 2006 16:09:29 +0000
parents b6d2f6fd3e11
children 658f8ff2a442
line wrap: on
line diff
--- a/Python/graminit.c	Tue Feb 28 12:11:57 2006 +0000
+++ b/Python/graminit.c	Tue Feb 28 16:09:29 2006 +0000
@@ -513,34 +513,45 @@
 	{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 state states_26[7] = {
+static arc arcs_26_8[1] = {
+	{15, 6},
+};
+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 @@
 	 "\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"},