summaryrefslogtreecommitdiffstats
path: root/Lib/lib2to3/fixes/fix_except.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-03-19 05:22:42 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-03-19 05:22:42 (GMT)
commitab41b370a3eb1444b8ada38311a1bb498575a81c (patch)
treeb22e09cdf2029c150bee013d8942df92f1a22250 /Lib/lib2to3/fixes/fix_except.py
parentaad2b61f441f4af66cb6bbdcc0d74092047816b2 (diff)
downloadcpython-ab41b370a3eb1444b8ada38311a1bb498575a81c.zip
cpython-ab41b370a3eb1444b8ada38311a1bb498575a81c.tar.gz
cpython-ab41b370a3eb1444b8ada38311a1bb498575a81c.tar.bz2
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.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/lib2to3/fixes/fix_except.py b/Lib/lib2to3/fixes/fix_except.py
index 340575a..34281a0 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):