mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 61988-61990 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r61988 | martin.v.loewis | 2008-03-28 06:25:36 +0100 (Fr, 28 Mär 2008) | 2 lines

  Disable test that depends on #2412 being fixed.
................
  r61989 | martin.v.loewis | 2008-03-28 06:26:10 +0100 (Fr, 28 Mär 2008) | 2 lines

  Run 2to3 tests.
................
  r61990 | martin.v.loewis | 2008-03-28 06:27:44 +0100 (Fr, 28 Mär 2008) | 13 lines

  Merged revisions 61825-61989 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r61899 | collin.winter | 2008-03-25 17:53:41 +0100 (Di, 25 Mär 2008) | 1 line

    Add a missing explicit fixer to test_all_fixers.
  ........
    r61983 | collin.winter | 2008-03-28 03:19:46 +0100 (Fr, 28 Mär 2008) | 2 lines

    Fix http://bugs.python.org/issue2453: support empty excepts in fix_except.
  ........
................
This commit is contained in:
Martin v. Löwis 2008-03-28 05:29:57 +00:00
parent ba4af493a5
commit 51d1864eae
4 changed files with 92 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/lib2to3/fixes/fix_except.py
View file

@ -37,15 +37,18 @@ class FixExcept(basefix.BaseFix):
PATTERN = """
try_stmt< 'try' ':' suite
cleanup=((except_clause ':' suite)+ ['else' ':' suite]
['finally' ':' suite]
| 'finally' ':' suite) >
cleanup=(except_clause ':' suite)+
tail=(['except' ':' suite]
['else' ':' suite]
['finally' ':' suite]) >
"""
def transform(self, node, results):
syms = self.syms
try_cleanup = [ch.clone() for ch in results['cleanup']]
tail = [n.clone() for n in results["tail"]]
try_cleanup = [ch.clone() for ch in results["cleanup"]]
for except_clause, e_suite in find_excepts(try_cleanup):
if len(except_clause.children) == 4:
(E, comma, N) = except_clause.children[1:4]
@ -85,5 +88,5 @@ class FixExcept(basefix.BaseFix):
N.set_prefix(" ")
#TODO(cwinter) fix this when children becomes a smart list
children = [c.clone() for c in node.children[:3]] + try_cleanup
children = [c.clone() for c in node.children[:3]] + try_cleanup + tail
return pytree.Node(node.type, children)