diff options
Diffstat (limited to 'Lib/lib2to3/fixes/fix_print.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_print.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Lib/lib2to3/fixes/fix_print.py b/Lib/lib2to3/fixes/fix_print.py index 8780322..98786b3 100644 --- a/Lib/lib2to3/fixes/fix_print.py +++ b/Lib/lib2to3/fixes/fix_print.py @@ -18,7 +18,7 @@ from .. import patcomp from .. import pytree from ..pgen2 import token from .. import fixer_base -from ..fixer_util import Name, Call, Comma, String +from ..fixer_util import Name, Call, Comma, String, is_tuple parend_expr = patcomp.compile_pattern( @@ -41,10 +41,10 @@ class FixPrint(fixer_base.BaseFix): if bare_print: # Special-case print all by itself - bare_print.replace(Call(Name("print"), [], + bare_print.replace(Call(Name(u"print"), [], prefix=bare_print.prefix)) return - assert node.children[0] == Name("print") + 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 @@ -55,33 +55,33 @@ class FixPrint(fixer_base.BaseFix): if args and args[-1] == Comma(): args = args[:-1] end = " " - if args and args[0] == pytree.Leaf(token.RIGHTSHIFT, ">>"): + 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 = "" + 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, "sep", String(repr(sep))) + self.add_kwarg(l_args, u"sep", String(repr(sep))) if end is not None: - self.add_kwarg(l_args, "end", String(repr(end))) + self.add_kwarg(l_args, u"end", String(repr(end))) if file is not None: - self.add_kwarg(l_args, "file", file) - n_stmt = Call(Name("print"), l_args) + 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 = "" + n_expr.prefix = u"" n_argument = pytree.Node(self.syms.argument, (Name(s_kwd), - pytree.Leaf(token.EQUAL, "="), + pytree.Leaf(token.EQUAL, u"="), n_expr)) if l_nodes: l_nodes.append(Comma()) - n_argument.prefix = " " + n_argument.prefix = u" " l_nodes.append(n_argument) |