diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-03-19 05:26:18 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-03-19 05:26:18 (GMT) |
| commit | f733c60d9aea123a46cd41dbe4dedee7aa2f20f3 (patch) | |
| tree | 9088f72f6f0177c41bfd68c186ccfe6d2adeed22 /Lib/lib2to3/fixes/fix_raise.py | |
| parent | ef04c44e29a8276a484f58d03a75a2dec516302d (diff) | |
| download | cpython-f733c60d9aea123a46cd41dbe4dedee7aa2f20f3.zip cpython-f733c60d9aea123a46cd41dbe4dedee7aa2f20f3.tar.gz cpython-f733c60d9aea123a46cd41dbe4dedee7aa2f20f3.tar.bz2 | |
Merged revisions 61602 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r61602 | martin.v.loewis | 2008-03-19 00:22:42 -0500 (Mi, 19 Mär 2008) | 17 lines
Merged revisions 61598-61599,61601 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r61598 | david.wolever | 2008-03-18 23:58:33 -0500 (Di, 18 Mär 2008) | 1 line
Added fixer for zip, and refactored a bit of code in the process. Closing #2171.
........
r61599 | david.wolever | 2008-03-19 00:04:26 -0500 (Mi, 19 Mär 2008) | 3 lines
Removed a bunch of duplicate code -- it's in util now.
........
r61601 | martin.v.loewis | 2008-03-19 00:21:12 -0500 (Mi, 19 Mär 2008) | 2 lines
Fix whitespace.
........
................
Diffstat (limited to 'Lib/lib2to3/fixes/fix_raise.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_raise.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/lib2to3/fixes/fix_raise.py b/Lib/lib2to3/fixes/fix_raise.py index 2e9ffbc..dcf4278 100644 --- a/Lib/lib2to3/fixes/fix_raise.py +++ b/Lib/lib2to3/fixes/fix_raise.py @@ -12,9 +12,9 @@ raise "foo", V, T -> warns about string exceptions CAVEATS: 1) "raise E, V" will be incorrectly translated if V is an exception instance. The correct Python 3 idiom is - + raise E from V - + but since we can't detect instance-hood by syntax alone and since any client code would have to be changed as well, we don't automate this. @@ -48,11 +48,11 @@ class FixRaise(basefix.BaseFix): # Since Python 3 will not support this, we recurse down any tuple # literals, always taking the first element. if is_tuple(exc): - while is_tuple(exc): - # exc.children[1:-1] is the unparenthesized tuple - # exc.children[1].children[0] is the first element of the tuple - exc = exc.children[1].children[0].clone() - exc.set_prefix(" ") + while is_tuple(exc): + # exc.children[1:-1] is the unparenthesized tuple + # exc.children[1].children[0] is the first element of the tuple + exc = exc.children[1].children[0].clone() + exc.set_prefix(" ") if "val" not in results: # One-argument raise |