Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
........
This commit is contained in:
Benjamin Peterson 2010-05-22 18:52:21 +00:00
parent 54b40ee929
commit 36cd75ab8d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/lib2to3/fixes/fix_sys_exc.py
View File

@ -20,7 +20,7 @@ class FixSysExc(fixer_base.BaseFix):
def transform(self, node, results): def transform(self, node, results):
sys_attr = results["attribute"][0] 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) call = Call(Name(u"exc_info"), prefix=sys_attr.prefix)
attr = Attr(Name(u"sys"), call) attr = Attr(Name(u"sys"), call)

4
Lib/lib2to3/refactor.py
View File

@ -564,7 +564,9 @@ class RefactoringTool(object):
This is necessary to get correct line number / offset information This is necessary to get correct line number / offset information
in the parser diagnostics and embedded into the parse tree. 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): def wrap_toks(self, block, lineno, indent):
"""Wraps a tokenize stream to systematically modify start/end.""" """Wraps a tokenize stream to systematically modify start/end."""