mirror of
https://github.com/python/cpython.git
synced 2025-11-04 07:31:38 +00:00
ef04c44e29
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61596 | martin.v.loewis | 2008-03-18 23:43:46 -0500 (Di, 18 Mär 2008) | 2 lines Import lib2to3. ........ r61597 | martin.v.loewis | 2008-03-18 23:58:04 -0500 (Di, 18 Mär 2008) | 3 lines Initialized merge tracking via "svnmerge" with revisions "1-61595" from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........
58 lines
1.8 KiB
Python
58 lines
1.8 KiB
Python
# Copyright 2006 Google, Inc. All Rights Reserved.
|
|
# Licensed to PSF under a Contributor Agreement.
|
|
|
|
"""Fixer for apply().
|
|
|
|
This converts apply(func, v, k) into (func)(*v, **k)."""
|
|
|
|
# Local imports
|
|
from .. import pytree
|
|
from ..pgen2 import token
|
|
from . import basefix
|
|
from .util import Call, Comma
|
|
|
|
class FixApply(basefix.BaseFix):
|
|
|
|
PATTERN = """
|
|
power< 'apply'
|
|
trailer<
|
|
'('
|
|
arglist<
|
|
(not argument<NAME '=' any>) func=any ','
|
|
(not argument<NAME '=' any>) args=any [','
|
|
(not argument<NAME '=' any>) kwds=any] [',']
|
|
>
|
|
')'
|
|
>
|
|
>
|
|
"""
|
|
|
|
def transform(self, node, results):
|
|
syms = self.syms
|
|
assert results
|
|
func = results["func"]
|
|
args = results["args"]
|
|
kwds = results.get("kwds")
|
|
prefix = node.get_prefix()
|
|
func = func.clone()
|
|
if (func.type not in (token.NAME, syms.atom) and
|
|
(func.type != syms.power or
|
|
func.children[-2].type == token.DOUBLESTAR)):
|
|
# Need to parenthesize
|
|
func = self.parenthesize(func)
|
|
func.set_prefix("")
|
|
args = args.clone()
|
|
args.set_prefix("")
|
|
if kwds is not None:
|
|
kwds = kwds.clone()
|
|
kwds.set_prefix("")
|
|
l_newargs = [pytree.Leaf(token.STAR, "*"), args]
|
|
if kwds is not None:
|
|
l_newargs.extend([Comma(),
|
|
pytree.Leaf(token.DOUBLESTAR, "**"),
|
|
kwds])
|
|
l_newargs[-2].set_prefix(" ") # that's the ** token
|
|
# XXX Sometimes we could be cleverer, e.g. apply(f, (x, y) + t)
|
|
# can be translated into f(x, y, *t) instead of f(*(x, y) + t)
|
|
#new = pytree.Node(syms.power, (func, ArgList(l_newargs)))
|
|
return Call(func, l_newargs, prefix=prefix)
|