diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-05-22 18:52:21 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-05-22 18:52:21 (GMT) |
| commit | 36cd75ab8d23784c03be5494a45f18cab337721a (patch) | |
| tree | edf4c49201588d8234f23fba94297ca8753d3136 /Lib | |
| parent | 54b40ee92932ff5019528fe4a21274e7f2236b60 (diff) | |
| download | cpython-36cd75ab8d23784c03be5494a45f18cab337721a.zip cpython-36cd75ab8d23784c03be5494a45f18cab337721a.tar.gz cpython-36cd75ab8d23784c03be5494a45f18cab337721a.tar.bz2 | |
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
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_sys_exc.py | 2 | ||||
| -rw-r--r-- | Lib/lib2to3/refactor.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/lib2to3/fixes/fix_sys_exc.py b/Lib/lib2to3/fixes/fix_sys_exc.py index 58bbabb..348929b 100644 --- a/Lib/lib2to3/fixes/fix_sys_exc.py +++ b/Lib/lib2to3/fixes/fix_sys_exc.py @@ -20,7 +20,7 @@ class FixSysExc(fixer_base.BaseFix): 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) diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py index 5982ed0..3e94699 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.""" |