From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 22 May 2010 19:40:31 +0000 (+0000)
Subject: Merged revisions 81481 via svnmerge from
X-Git-Tag: v3.1.3rc1~712
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=862793819186b67fe83bbbf77b092c10a1a02818;p=python

Merged revisions 81481 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81481 | benjamin.peterson | 2010-05-22 13:59:24 -0500 (Sat, 22 May 2010) | 20 lines

  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
    ........
  ................
................
---

diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
index d4af834781..3f4246073a 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."""