[Python-checkins] r82556 - in python/branches/release31-maint: Lib/test/test_parser.py Modules/parsermodule.c
mark.dickinson
python-checkins at python.org
Sun Jul 4 20:39:48 CEST 2010
Author: mark.dickinson
Date: Sun Jul 4 20:39:48 2010
New Revision: 82556
Log:
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.
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Lib/test/test_parser.py
python/branches/release31-maint/Modules/parsermodule.c
Modified: python/branches/release31-maint/Lib/test/test_parser.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_parser.py (original)
+++ python/branches/release31-maint/Lib/test/test_parser.py Sun Jul 4 20:39:48 2010
@@ -193,8 +193,14 @@
def test_relative_imports(self):
self.check_suite("from . import name")
self.check_suite("from .. import name")
+ # check all the way up to '....', since '...' is tokenized
+ # differently from '.' (it's an ellipsis token).
+ self.check_suite("from ... import name")
+ self.check_suite("from .... import name")
self.check_suite("from .pkg import name")
self.check_suite("from ..pkg import name")
+ self.check_suite("from ...pkg import name")
+ self.check_suite("from ....pkg import name")
def test_pep263(self):
self.check_suite("# -*- coding: iso-8859-1 -*-\n"
Modified: python/branches/release31-maint/Modules/parsermodule.c
==============================================================================
--- python/branches/release31-maint/Modules/parsermodule.c (original)
+++ python/branches/release31-maint/Modules/parsermodule.c Sun Jul 4 20:39:48 2010
@@ -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 | '.'+)
More information about the Python-checkins
mailing list