Mercurial > cpython-lru_cache-weakref
diff Modules/parsermodule.c @ 62789:692b7989cd92 3.1
Merged revisions 82552-82553 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82552 | mark.dickinson | 2010-07-04 19:11:51 +0100 (Sun, 04 Jul 2010) | 2 lines
Issue #9130: Fix validation of relative imports in parser module.
........
r82553 | mark.dickinson | 2010-07-04 19:15:26 +0100 (Sun, 04 Jul 2010) | 1 line
Fix symbol numbers in test_parser test.
........
| author | Mark Dickinson <dickinsm@gmail.com> |
|---|---|
| date | Sun, 04 Jul 2010 18:16:43 +0000 |
| parents | 18282039c5c9 |
| children | 3aa22428582a |
line wrap: on
line diff
--- a/Modules/parsermodule.c Sun Jul 04 17:33:33 2010 +0000 +++ b/Modules/parsermodule.c Sun Jul 04 18:16:43 2010 +0000 @@ -1763,8 +1763,8 @@ return i-1; } -/* 'from' ('.'* dotted_name | '.') 'import' ('*' | '(' import_as_names ')' | - * import_as_names +/* import_from: ('from' ('.'* dotted_name | '.'+) + * 'import' ('*' | '(' import_as_names ')' | import_as_names)) */ static int validate_import_from(node *tree) @@ -1774,7 +1774,8 @@ int havename = (TYPE(CHILD(tree, ndots + 1)) == dotted_name); int offset = ndots + havename; int res = validate_ntype(tree, import_from) - && (nch >= 4 + ndots) + && (offset >= 1) + && (nch >= 3 + offset) && validate_name(CHILD(tree, 0), "from") && (!havename || validate_dotted_name(CHILD(tree, ndots + 1))) && validate_name(CHILD(tree, offset + 1), "import");