Merged revisions 67077 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67077 | benjamin.peterson | 2008-11-03 09:14:51 -0600 (Mon, 03 Nov 2008) | 1 line

  #4048 make the parser module accept relative imports as valid
........
This commit is contained in:
Benjamin Peterson 2008-11-03 15:18:30 +00:00
parent 084ce7a5dc
commit eeed0c7822
4 changed files with 7 additions and 2 deletions

View File

@ -1,4 +1,5 @@
import parser
import os
import unittest
import sys
from test import test_support
@ -179,6 +180,7 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
"from sys.path import (dirname, basename as my_basename)")
self.check_suite(
"from sys.path import (dirname, basename as my_basename,)")
self.check_suite("from .bogus import x")
def test_basic_import_statement(self):
self.check_suite("import sys")

View File

@ -62,6 +62,7 @@ Eric Beser
Steven Bethard
Stephen Bevan
Ron Bickers
David Binger
Dominic Binks
Philippe Biondi
Stuart Bishop

View File

@ -12,6 +12,8 @@ What's New in Python 2.6.1 alpha 1
Core and Builtins
-----------------
- Issue #4048: The parser module now correctly validates relative imports.
- Issue #4225: ``from __future__ import unicode_literals`` didn't work in an
exec statement.

View File

@ -1879,10 +1879,10 @@ static int
count_from_dots(node *tree)
{
int i;
for (i = 0; i < NCH(tree); i++)
for (i = 1; i < NCH(tree); i++)
if (TYPE(CHILD(tree, i)) != DOT)
break;
return i;
return i-1;
}
/* 'from' ('.'* dotted_name | '.') 'import' ('*' | '(' import_as_names ')' |