mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 82555 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82555 | mark.dickinson | 2010-07-04 19:38:57 +0100 (Sun, 04 Jul 2010) | 2 lines

  Issue #9130: Validate ellipsis tokens in relative imports.
........
This commit is contained in:
Mark Dickinson 2010-07-04 18:39:48 +00:00
parent 1b9b5727cc
commit 0dce815c2b
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/parsermodule.c
View file

@ -1750,17 +1750,17 @@ validate_import_name(node *tree)
&& validate_dotted_as_names(CHILD(tree, 1)));
}
/* Helper function to count the number of leading dots in
/* Helper function to count the number of leading dots (or ellipsis tokens) in
* 'from ...module import name'
*/
static int
count_from_dots(node *tree)
{
int i;
for (i = 1; i < NCH(tree); i++)
if (TYPE(CHILD(tree, i)) != DOT)
break;
return i-1;
int i;
for (i = 1; i < NCH(tree); i++)
if (TYPE(CHILD(tree, i)) != DOT && TYPE(CHILD(tree, i)) != ELLIPSIS)
break;
return i - 1;
}
/* import_from: ('from' ('.'* dotted_name | '.'+)