From 2243e5e57d74259b563abd75f8dfbbe47bc43259 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 22 May 2010 18:59:24 +0000 Subject: Merged revisions 81479 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r81479 | benjamin.peterson | 2010-05-22 13:52:21 -0500 (Sat, 22 May 2010) | 13 lines Merged revisions 80937,81478 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r80937 | benjamin.peterson | 2010-05-07 14:10:58 -0500 (Fri, 07 May 2010) | 1 line remove redundant unicode call ........ r81478 | benjamin.peterson | 2010-05-22 13:47:39 -0500 (Sat, 22 May 2010) | 1 line ensure doctests have some future_features ........ ................ --- Lib/lib2to3/refactor.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py index d4af834..3f42460 100644 --- a/Lib/lib2to3/refactor.py +++ b/Lib/lib2to3/refactor.py @@ -564,7 +564,9 @@ class RefactoringTool(object): This is necessary to get correct line number / offset information in the parser diagnostics and embedded into the parse tree. """ - return self.driver.parse_tokens(self.wrap_toks(block, lineno, indent)) + tree = self.driver.parse_tokens(self.wrap_toks(block, lineno, indent)) + tree.future_features = frozenset() + return tree def wrap_toks(self, block, lineno, indent): """Wraps a tokenize stream to systematically modify start/end.""" -- cgit v0.12