mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 82552-82553 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Mark Dickinson 2010-07-04 18:16:43 +00:00
parent 31a0f86e36
commit 1b9b5727cc
3 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Modules/parsermodule.c
View file

@ -1763,8 +1763,8 @@ count_from_dots(node *tree)
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 @@ validate_import_from(node *tree)
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");