[Python-checkins] r81482 - in python/branches/release26-maint: Lib/lib2to3 Lib/lib2to3/fixes/fix_sys_exc.py Lib/lib2to3/refactor.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat May 22 20:59:38 2010
New Revision: 81482

Log:
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/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/lib2to3/   (props changed)
   python/branches/release26-maint/Lib/lib2to3/fixes/fix_sys_exc.py
   python/branches/release26-maint/Lib/lib2to3/refactor.py

Modified: python/branches/release26-maint/Lib/lib2to3/fixes/fix_sys_exc.py
==============================================================================
--- python/branches/release26-maint/Lib/lib2to3/fixes/fix_sys_exc.py	(original)
+++ python/branches/release26-maint/Lib/lib2to3/fixes/fix_sys_exc.py	Sat May 22 20:59:38 2010
@@ -20,7 +20,7 @@
 
     def transform(self, node, results):
         sys_attr = results["attribute"][0]
-        index = Number(unicode(self.exc_info.index(sys_attr.value)))
+        index = Number(self.exc_info.index(sys_attr.value))
 
         call = Call(Name(u"exc_info"), prefix=sys_attr.prefix)
         attr = Attr(Name(u"sys"), call)

Modified: python/branches/release26-maint/Lib/lib2to3/refactor.py
==============================================================================
--- python/branches/release26-maint/Lib/lib2to3/refactor.py	(original)
+++ python/branches/release26-maint/Lib/lib2to3/refactor.py	Sat May 22 20:59:38 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."""