mirror of
https://github.com/python/cpython.git
synced 2024-12-01 03:01:36 +01: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 ........
57 lines
1.5 KiB
Python
57 lines
1.5 KiB
Python
"""Fixer for generator.throw(E, V, T).
|
|
|
|
g.throw(E) -> g.throw(E)
|
|
g.throw(E, V) -> g.throw(E(V))
|
|
g.throw(E, V, T) -> g.throw(E(V).with_traceback(T))
|
|
|
|
g.throw("foo"[, V[, T]]) will warn about string exceptions."""
|
|
# Author: Collin Winter
|
|
|
|
# Local imports
|
|
from .. import pytree
|
|
from ..pgen2 import token
|
|
from .. import fixer_base
|
|
from ..fixer_util import Name, Call, ArgList, Attr, is_tuple
|
|
|
|
class FixThrow(fixer_base.BaseFix):
|
|
BM_compatible = True
|
|
PATTERN = """
|
|
power< any trailer< '.' 'throw' >
|
|
trailer< '(' args=arglist< exc=any ',' val=any [',' tb=any] > ')' >
|
|
>
|
|
|
|
|
power< any trailer< '.' 'throw' > trailer< '(' exc=any ')' > >
|
|
"""
|
|
|
|
def transform(self, node, results):
|
|
syms = self.syms
|
|
|
|
exc = results["exc"].clone()
|
|
if exc.type is token.STRING:
|
|
self.cannot_convert(node, "Python 3 does not support string exceptions")
|
|
return
|
|
|
|
# Leave "g.throw(E)" alone
|
|
val = results.get("val")
|
|
if val is None:
|
|
return
|
|
|
|
val = val.clone()
|
|
if is_tuple(val):
|
|
args = [c.clone() for c in val.children[1:-1]]
|
|
else:
|
|
val.prefix = ""
|
|
args = [val]
|
|
|
|
throw_args = results["args"]
|
|
|
|
if "tb" in results:
|
|
tb = results["tb"].clone()
|
|
tb.prefix = ""
|
|
|
|
e = Call(exc, args)
|
|
with_tb = Attr(e, Name('with_traceback')) + [ArgList([tb])]
|
|
throw_args.replace(pytree.Node(syms.power, with_tb))
|
|
else:
|
|
throw_args.replace(Call(exc, args))
|