mirror of
https://github.com/python/cpython.git
synced 2025-11-03 19:34:08 +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 ........
90 lines
2.9 KiB
Python
90 lines
2.9 KiB
Python
"""Fixer for 'raise E, V, T'
|
|
|
|
raise -> raise
|
|
raise E -> raise E
|
|
raise E, V -> raise E(V)
|
|
raise E, V, T -> raise E(V).with_traceback(T)
|
|
raise E, None, T -> raise E.with_traceback(T)
|
|
|
|
raise (((E, E'), E''), E'''), V -> raise E(V)
|
|
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.
|
|
"""
|
|
# Author: Collin Winter
|
|
|
|
# Local imports
|
|
from .. import pytree
|
|
from ..pgen2 import token
|
|
from .. import fixer_base
|
|
from ..fixer_util import Name, Call, Attr, ArgList, is_tuple
|
|
|
|
class FixRaise(fixer_base.BaseFix):
|
|
|
|
BM_compatible = True
|
|
PATTERN = """
|
|
raise_stmt< 'raise' exc=any [',' val=any [',' tb=any]] >
|
|
"""
|
|
|
|
def transform(self, node, results):
|
|
syms = self.syms
|
|
|
|
exc = results["exc"].clone()
|
|
if exc.type == token.STRING:
|
|
msg = "Python 3 does not support string exceptions"
|
|
self.cannot_convert(node, msg)
|
|
return
|
|
|
|
# Python 2 supports
|
|
# raise ((((E1, E2), E3), E4), E5), V
|
|
# as a synonym for
|
|
# raise E1, V
|
|
# 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.prefix = " "
|
|
|
|
if "val" not in results:
|
|
# One-argument raise
|
|
new = pytree.Node(syms.raise_stmt, [Name("raise"), exc])
|
|
new.prefix = node.prefix
|
|
return new
|
|
|
|
val = results["val"].clone()
|
|
if is_tuple(val):
|
|
args = [c.clone() for c in val.children[1:-1]]
|
|
else:
|
|
val.prefix = ""
|
|
args = [val]
|
|
|
|
if "tb" in results:
|
|
tb = results["tb"].clone()
|
|
tb.prefix = ""
|
|
|
|
e = exc
|
|
# If there's a traceback and None is passed as the value, then don't
|
|
# add a call, since the user probably just wants to add a
|
|
# traceback. See issue #9661.
|
|
if val.type != token.NAME or val.value != "None":
|
|
e = Call(exc, args)
|
|
with_tb = Attr(e, Name('with_traceback')) + [ArgList([tb])]
|
|
new = pytree.Node(syms.simple_stmt, [Name("raise")] + with_tb)
|
|
new.prefix = node.prefix
|
|
return new
|
|
else:
|
|
return pytree.Node(syms.raise_stmt,
|
|
[Name("raise"), Call(exc, args)],
|
|
prefix=node.prefix)
|