backport r67077 from the trunk: parser module now correctly validates relative imports
diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index 8aa1657..d76db6c 100644
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -1,4 +1,5 @@
import parser
+import os
import unittest
from test import test_support
@@ -168,6 +169,7 @@
"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 c3a0942..dddc40d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -60,6 +60,7 @@
Steven Bethard
Stephen Bevan
Ron Bickers
+David Binger
Dominic Binks
Philippe Biondi
Stuart Bishop
diff --git a/Misc/NEWS b/Misc/NEWS
index 6e8a25a..c8651c1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@
Core and builtins
-----------------
+- Issue #4048: The parser module now correctly validates relative imports.
+
- Issue #4176: Fixed a crash when pickling an object which ``__reduce__``
method does not return iterators for the 4th and 5th items.
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index e33197e..e49e600 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -1804,10 +1804,10 @@
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 ')' |