[Python-checkins] r81483 - in python/branches/release31-maint: Lib/lib2to3/refactor.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat May 22 21:40:31 2010
New Revision: 81483

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/lib2to3/refactor.py

Modified: python/branches/release31-maint/Lib/lib2to3/refactor.py
==============================================================================
--- python/branches/release31-maint/Lib/lib2to3/refactor.py	(original)
+++ python/branches/release31-maint/Lib/lib2to3/refactor.py	Sat May 22 21:40:31 2010
@@ -564,7 +564,9 @@
         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."""