mirror of
https://github.com/python/cpython.git
synced 2025-11-04 07:31:38 +00:00
f37eb3a184
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r83852 | benjamin.peterson | 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) | 1 line wrap with parens ........ r83853 | benjamin.peterson | 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) | 1 line use parens ........ r83857 | benjamin.peterson | 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) | 1 line things which use touch_import should be pre order ........ r84042 | george.boutsioukis | 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) | 2 lines This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers. ........ r84216 | benjamin.peterson | 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) | 1 line allow star_expr in testlist_gexp ........ r84274 | benjamin.peterson | 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) | 1 line wrap long line ........ r84275 | benjamin.peterson | 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) | 1 line cleanup ........ r84276 | benjamin.peterson | 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) | 1 line when there's a None value and a traceback, don't call type with it #9661 ........ r84375 | george.boutsioukis | 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) | 3 lines Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code. ........ r85388 | benjamin.peterson | 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) | 1 line fix urllib fixer with multiple as imports on a line #10069 ........ r85478 | benjamin.peterson | 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) | 1 line stop abusing docstrings ........ r85506 | benjamin.peterson | 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) | 1 line kill sibling import ........ r85507 | benjamin.peterson | 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) | 1 line remove trailing whitespace ........ r85508 | benjamin.peterson | 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) | 1 line typo ........
93 lines
3.3 KiB
Python
93 lines
3.3 KiB
Python
"""Fixer for except statements with named exceptions.
|
|
|
|
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
|
|
"""
|
|
# Author: Collin Winter
|
|
|
|
# Local imports
|
|
from .. import pytree
|
|
from ..pgen2 import token
|
|
from .. import fixer_base
|
|
from ..fixer_util import Assign, Attr, Name, is_tuple, is_list, syms
|
|
|
|
def find_excepts(nodes):
|
|
for i, n in enumerate(nodes):
|
|
if n.type == syms.except_clause:
|
|
if n.children[0].value == 'except':
|
|
yield (n, nodes[i+2])
|
|
|
|
class FixExcept(fixer_base.BaseFix):
|
|
BM_compatible = True
|
|
|
|
PATTERN = """
|
|
try_stmt< 'try' ':' (simple_stmt | suite)
|
|
cleanup=(except_clause ':' (simple_stmt | suite))+
|
|
tail=(['except' ':' (simple_stmt | suite)]
|
|
['else' ':' (simple_stmt | suite)]
|
|
['finally' ':' (simple_stmt | suite)]) >
|
|
"""
|
|
|
|
def transform(self, node, results):
|
|
syms = self.syms
|
|
|
|
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]
|
|
comma.replace(Name("as", prefix=" "))
|
|
|
|
if N.type != token.NAME:
|
|
# Generate a new N for the except clause
|
|
new_N = Name(self.new_name(), prefix=" ")
|
|
target = N.clone()
|
|
target.prefix = ""
|
|
N.replace(new_N)
|
|
new_N = new_N.clone()
|
|
|
|
# Insert "old_N = new_N" as the first statement in
|
|
# the except body. This loop skips leading whitespace
|
|
# and indents
|
|
#TODO(cwinter) suite-cleanup
|
|
suite_stmts = e_suite.children
|
|
for i, stmt in enumerate(suite_stmts):
|
|
if isinstance(stmt, pytree.Node):
|
|
break
|
|
|
|
# The assignment is different if old_N is a tuple or list
|
|
# In that case, the assignment is old_N = new_N.args
|
|
if is_tuple(N) or is_list(N):
|
|
assign = Assign(target, Attr(new_N, Name('args')))
|
|
else:
|
|
assign = Assign(target, new_N)
|
|
|
|
#TODO(cwinter) stopgap until children becomes a smart list
|
|
for child in reversed(suite_stmts[:i]):
|
|
e_suite.insert_child(0, child)
|
|
e_suite.insert_child(i, assign)
|
|
elif N.prefix == "":
|
|
# No space after a comma is legal; no space after "as",
|
|
# not so much.
|
|
N.prefix = " "
|
|
|
|
#TODO(cwinter) fix this when children becomes a smart list
|
|
children = [c.clone() for c in node.children[:3]] + try_cleanup + tail
|
|
return pytree.Node(node.type, children)
|