[Python-checkins] r67077 - in python/trunk: Lib/test/test_parser.py Misc/ACKS Misc/NEWS Modules/parsermodule.c
benjamin.peterson
python-checkins at python.org
Mon Nov 3 16:14:52 CET 2008
Author: benjamin.peterson
Date: Mon Nov 3 16:14:51 2008
New Revision: 67077
Log:
#4048 make the parser module accept relative imports as valid
Modified:
python/trunk/Lib/test/test_parser.py
python/trunk/Misc/ACKS
python/trunk/Misc/NEWS
python/trunk/Modules/parsermodule.c
Modified: python/trunk/Lib/test/test_parser.py
==============================================================================
--- python/trunk/Lib/test/test_parser.py (original)
+++ python/trunk/Lib/test/test_parser.py Mon Nov 3 16:14:51 2008
@@ -1,4 +1,5 @@
import parser
+import os
import unittest
import sys
from test import test_support
@@ -179,6 +180,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")
Modified: python/trunk/Misc/ACKS
==============================================================================
--- python/trunk/Misc/ACKS (original)
+++ python/trunk/Misc/ACKS Mon Nov 3 16:14:51 2008
@@ -62,6 +62,7 @@
Steven Bethard
Stephen Bevan
Ron Bickers
+David Binger
Dominic Binks
Philippe Biondi
Stuart Bishop
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Mon Nov 3 16:14:51 2008
@@ -12,6 +12,8 @@
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.
Modified: python/trunk/Modules/parsermodule.c
==============================================================================
--- python/trunk/Modules/parsermodule.c (original)
+++ python/trunk/Modules/parsermodule.c Mon Nov 3 16:14:51 2008
@@ -1879,10 +1879,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 ')' |
More information about the Python-checkins
mailing list