mirror of
https://github.com/python/cpython
synced 2024-09-22 11:21:34 +00:00
b0871cac11
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r85510 | benjamin.peterson | 2010-10-14 18:00:04 -0500 (Thu, 14 Oct 2010) | 61 lines
Merged revisions 83852-83853,83857,84042,84216,84274-84276,84375,85388,85478,85506-85508 via svnmerge from
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
........
................
88 lines
2.8 KiB
Python
88 lines
2.8 KiB
Python
# Copyright 2006 Google, Inc. All Rights Reserved.
|
|
# Licensed to PSF under a Contributor Agreement.
|
|
|
|
"""Fixer for print.
|
|
|
|
Change:
|
|
'print' into 'print()'
|
|
'print ...' into 'print(...)'
|
|
'print ... ,' into 'print(..., end=" ")'
|
|
'print >>x, ...' into 'print(..., file=x)'
|
|
|
|
No changes are applied if print_function is imported from __future__
|
|
|
|
"""
|
|
|
|
# Local imports
|
|
from .. import patcomp
|
|
from .. import pytree
|
|
from ..pgen2 import token
|
|
from .. import fixer_base
|
|
from ..fixer_util import Name, Call, Comma, String, is_tuple
|
|
|
|
|
|
parend_expr = patcomp.compile_pattern(
|
|
"""atom< '(' [atom|STRING|NAME] ')' >"""
|
|
)
|
|
|
|
|
|
class FixPrint(fixer_base.BaseFix):
|
|
|
|
BM_compatible = True
|
|
|
|
PATTERN = """
|
|
simple_stmt< any* bare='print' any* > | print_stmt
|
|
"""
|
|
|
|
def transform(self, node, results):
|
|
assert results
|
|
|
|
bare_print = results.get("bare")
|
|
|
|
if bare_print:
|
|
# Special-case print all by itself
|
|
bare_print.replace(Call(Name("print"), [],
|
|
prefix=bare_print.prefix))
|
|
return
|
|
assert node.children[0] == Name("print")
|
|
args = node.children[1:]
|
|
if len(args) == 1 and parend_expr.match(args[0]):
|
|
# We don't want to keep sticking parens around an
|
|
# already-parenthesised expression.
|
|
return
|
|
|
|
sep = end = file = None
|
|
if args and args[-1] == Comma():
|
|
args = args[:-1]
|
|
end = " "
|
|
if args and args[0] == pytree.Leaf(token.RIGHTSHIFT, ">>"):
|
|
assert len(args) >= 2
|
|
file = args[1].clone()
|
|
args = args[3:] # Strip a possible comma after the file expression
|
|
# Now synthesize a print(args, sep=..., end=..., file=...) node.
|
|
l_args = [arg.clone() for arg in args]
|
|
if l_args:
|
|
l_args[0].prefix = ""
|
|
if sep is not None or end is not None or file is not None:
|
|
if sep is not None:
|
|
self.add_kwarg(l_args, "sep", String(repr(sep)))
|
|
if end is not None:
|
|
self.add_kwarg(l_args, "end", String(repr(end)))
|
|
if file is not None:
|
|
self.add_kwarg(l_args, "file", file)
|
|
n_stmt = Call(Name("print"), l_args)
|
|
n_stmt.prefix = node.prefix
|
|
return n_stmt
|
|
|
|
def add_kwarg(self, l_nodes, s_kwd, n_expr):
|
|
# XXX All this prefix-setting may lose comments (though rarely)
|
|
n_expr.prefix = ""
|
|
n_argument = pytree.Node(self.syms.argument,
|
|
(Name(s_kwd),
|
|
pytree.Leaf(token.EQUAL, "="),
|
|
n_expr))
|
|
if l_nodes:
|
|
l_nodes.append(Comma())
|
|
n_argument.prefix = " "
|
|
l_nodes.append(n_argument)
|