Mercurial > cpython-lru_cache-weakref
diff Modules/parsermodule.c @ 62791:3aa22428582a 3.1
Merged revisions 82555 via svnmerge from
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.
........
| author | Mark Dickinson <dickinsm@gmail.com> |
|---|---|
| date | Sun, 04 Jul 2010 18:39:48 +0000 |
| parents | 692b7989cd92 |
| children | 0991b40e895d 3c9232a684ae |
line wrap: on
line diff
--- a/Modules/parsermodule.c Sun Jul 04 18:16:43 2010 +0000 +++ b/Modules/parsermodule.c Sun Jul 04 18:39:48 2010 +0000 @@ -1750,17 +1750,17 @@ && 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 | '.'+)