mirror of
https://github.com/python/cpython.git
synced 2025-07-31 07:04:42 +00:00
840077cd31
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r73771 | benjamin.peterson | 2009-07-02 10:56:55 -0500 (Thu, 02 Jul 2009) | 1 line force the imports fixer to be run after the import one #6400 ........ r73811 | benjamin.peterson | 2009-07-03 09:03:14 -0500 (Fri, 03 Jul 2009) | 1 line check for sep, not pathsep when looking for a subpackage #6408 ........ r73840 | benjamin.peterson | 2009-07-04 09:52:28 -0500 (Sat, 04 Jul 2009) | 1 line don't print diffs by default; it's annoying ........ r73842 | benjamin.peterson | 2009-07-04 09:58:46 -0500 (Sat, 04 Jul 2009) | 1 line complain when not showing diffs or writing ........ r73848 | alexandre.vassalotti | 2009-07-04 23:38:19 -0500 (Sat, 04 Jul 2009) | 2 lines Fix test_refactor_stdin to handle print_output() method with 4 arguments. ........ r73849 | alexandre.vassalotti | 2009-07-04 23:43:18 -0500 (Sat, 04 Jul 2009) | 5 lines Issue 2370: Add fixer for the removal of operator.isCallable() and operator.sequenceIncludes(). Patch contributed by Jeff Balogh (and updated by me). ........ r73861 | benjamin.peterson | 2009-07-05 09:15:53 -0500 (Sun, 05 Jul 2009) | 1 line cleanup and use unicode where appropiate ........ r73957 | benjamin.peterson | 2009-07-11 15:49:56 -0500 (Sat, 11 Jul 2009) | 1 line fix calls to str() with unicode() ........ r73958 | benjamin.peterson | 2009-07-11 15:51:51 -0500 (Sat, 11 Jul 2009) | 1 line more str() -> unicode() ........ r73959 | benjamin.peterson | 2009-07-11 16:40:08 -0500 (Sat, 11 Jul 2009) | 1 line add tests for refactor_dir() ........ r73960 | benjamin.peterson | 2009-07-11 16:44:32 -0500 (Sat, 11 Jul 2009) | 1 line don't parse files just because they end with 'py' (no dot) ........ r73964 | benjamin.peterson | 2009-07-11 17:30:15 -0500 (Sat, 11 Jul 2009) | 1 line simplify ........ r73965 | benjamin.peterson | 2009-07-11 17:31:30 -0500 (Sat, 11 Jul 2009) | 1 line remove usage of get_prefix() ........ r73966 | benjamin.peterson | 2009-07-11 17:33:35 -0500 (Sat, 11 Jul 2009) | 1 line revert unintended change in 73965 ........ r73967 | benjamin.peterson | 2009-07-11 17:34:44 -0500 (Sat, 11 Jul 2009) | 1 line avoid expensive checks and assume the node did change ........ r73968 | benjamin.peterson | 2009-07-11 20:46:46 -0500 (Sat, 11 Jul 2009) | 1 line use a regular dict for the heads to avoid adding lists in the loop ........ r73969 | benjamin.peterson | 2009-07-11 20:50:43 -0500 (Sat, 11 Jul 2009) | 1 line prefix headnode functions with '_' ........ r73972 | benjamin.peterson | 2009-07-11 21:25:45 -0500 (Sat, 11 Jul 2009) | 1 line try to make the head node dict as sparse as possible ........ r73973 | benjamin.peterson | 2009-07-11 21:59:49 -0500 (Sat, 11 Jul 2009) | 1 line a better idea; add an option to *not* print diffs ........ r73974 | benjamin.peterson | 2009-07-11 22:00:29 -0500 (Sat, 11 Jul 2009) | 1 line add space ........ r73977 | benjamin.peterson | 2009-07-12 10:16:07 -0500 (Sun, 12 Jul 2009) | 1 line update get_headnode_dict tests for recent changes ........ r73981 | benjamin.peterson | 2009-07-12 12:06:39 -0500 (Sun, 12 Jul 2009) | 4 lines detect when "from __future__ import print_function" is given Deprecate the 'print_function' option and the -p flag ........ r73984 | benjamin.peterson | 2009-07-12 16:16:37 -0500 (Sun, 12 Jul 2009) | 1 line add tests for Call; thanks Joe Amenta ........ r74065 | benjamin.peterson | 2009-07-17 12:52:49 -0500 (Fri, 17 Jul 2009) | 1 line pathname2url and url2pathname are in urllib.request not urllib.parse #6496 ........ r74113 | benjamin.peterson | 2009-07-20 08:56:57 -0500 (Mon, 20 Jul 2009) | 1 line fix deprecation warnings in tests ........
85 lines
2.8 KiB
Python
85 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):
|
|
|
|
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(u"print"), [],
|
|
prefix=bare_print.prefix))
|
|
return
|
|
assert node.children[0] == Name(u"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, u">>"):
|
|
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 = u""
|
|
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, u"sep", String(repr(sep)))
|
|
if end is not None:
|
|
self.add_kwarg(l_args, u"end", String(repr(end)))
|
|
if file is not None:
|
|
self.add_kwarg(l_args, u"file", file)
|
|
n_stmt = Call(Name(u"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 = u""
|
|
n_argument = pytree.Node(self.syms.argument,
|
|
(Name(s_kwd),
|
|
pytree.Leaf(token.EQUAL, u"="),
|
|
n_expr))
|
|
if l_nodes:
|
|
l_nodes.append(Comma())
|
|
n_argument.prefix = u" "
|
|
l_nodes.append(n_argument)
|