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.
........
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

View file

@ -190,6 +190,12 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
self.check_suite("import sys as system, math")
self.check_suite("import sys, math as my_math")
def test_relative_imports(self):
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")
def test_pep263(self):
self.check_suite("# -*- coding: iso-8859-1 -*-\n"
"pass\n")
@ -459,6 +465,20 @@ class IllegalSyntaxTestCase(unittest.TestCase):
(0, ''))
self.check_bad_tree(tree, "malformed global ast")
def test_missing_import_source(self):
# from import fred
tree = \
(257,
(268,
(269,
(270,
(282,
(284, (1, 'from'), (1, 'import'),
(287, (285, (1, 'fred')))))),
(4, ''))),
(4, ''), (0, ''))
self.check_bad_tree(tree, "from import fred")
class CompileTestCase(unittest.TestCase):