diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-03-19 05:26:18 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-03-19 05:26:18 +0000 |
| commit | f733c60d9aea123a46cd41dbe4dedee7aa2f20f3 (patch) | |
| tree | 9088f72f6f0177c41bfd68c186ccfe6d2adeed22 /Lib/lib2to3/fixes/fix_except.py | |
| parent | ef04c44e29a8276a484f58d03a75a2dec516302d (diff) | |
| download | cpython-git-f733c60d9aea123a46cd41dbe4dedee7aa2f20f3.tar.gz | |
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_except.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_except.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/lib2to3/fixes/fix_except.py b/Lib/lib2to3/fixes/fix_except.py index 340575ae4c..34281a0203 100644 --- a/Lib/lib2to3/fixes/fix_except.py +++ b/Lib/lib2to3/fixes/fix_except.py @@ -3,19 +3,19 @@ The following cases will be converted: - "except E, T:" where T is a name: - + except E as T: - + - "except E, T:" where T is not a name, tuple or list: - + except E as t: T = t - + This is done because the target of an "except" clause must be a name. - + - "except E, T:" where T is a tuple or list literal: - + except E as t: T = t.args """ @@ -39,7 +39,7 @@ class FixExcept(basefix.BaseFix): try_stmt< 'try' ':' suite cleanup=((except_clause ':' suite)+ ['else' ':' suite] ['finally' ':' suite] - | 'finally' ':' suite) > + | 'finally' ':' suite) > """ def transform(self, node, results): |