diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py index 9ecca51a3606..94b6113a0c3b 100644 --- a/Lib/test/test_parser.py +++ b/Lib/test/test_parser.py @@ -1,4 +1,5 @@ import parser +import os import unittest import sys from test import test_support @@ -179,6 +180,7 @@ def test_import_from_statement(self): "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") diff --git a/Misc/ACKS b/Misc/ACKS index ac8f6edd4349..72b18c9c5145 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -62,6 +62,7 @@ Eric Beser Steven Bethard Stephen Bevan Ron Bickers +David Binger Dominic Binks Philippe Biondi Stuart Bishop diff --git a/Misc/NEWS b/Misc/NEWS index 234a15d1cc09..8dd9ffb6f048 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,8 @@ What's New in Python 2.7 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. diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c index 423a0b350062..bea78c2ce129 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -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 ')' |