← Back to branch summary

~ubuntu-branches/ubuntu/lucid/python2.6/lucid

« back to all changes in this revision

Viewing changes to Lib/lib2to3/fixes/fix_print.py

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-03-11 13:30:19 UTC
  • mto: (10.1.13 sid)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: james.westby@ubuntu.com-20100311133019-sblbooa3uqrkoe70
Tags: upstream-2.6.5~rc2
Import upstream version 2.6.5~rc2

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/lib2to3/fixes/fix_print.py
26
26
              )
27
27
 
28
28
 
29
 
class FixPrint(fixer_base.ConditionalFix):
 
29
class FixPrint(fixer_base.BaseFix):
30
30
 
31
31
    PATTERN = """
32
32
              simple_stmt< any* bare='print' any* > | print_stmt
33
33
              """
34
34
 
35
 
    skip_on = '__future__.print_function'
36
 
 
37
35
    def transform(self, node, results):
38
36
        assert results
39
37
 
40
 
        if self.should_skip(node):
41
 
            return
42
 
 
43
38
        bare_print = results.get("bare")
44
39
 
45
40
        if bare_print:
46
41
            # Special-case print all by itself
47
 
            bare_print.replace(Call(Name("print"), [],
48
 
                               prefix=bare_print.get_prefix()))
 
42
            bare_print.replace(Call(Name(u"print"), [],
 
43
                               prefix=bare_print.prefix))
49
44
            return
50
 
        assert node.children[0] == Name("print")
 
45
        assert node.children[0] == Name(u"print")
51
46
        args = node.children[1:]
52
47
        if len(args) == 1 and parend_expr.match(args[0]):
53
48
            # We don't want to keep sticking parens around an
58
53
        if args and args[-1] == Comma():
59
54
            args = args[:-1]
60
55
            end = " "
61
 
        if args and args[0] == pytree.Leaf(token.RIGHTSHIFT, ">>"):
 
56
        if args and args[0] == pytree.Leaf(token.RIGHTSHIFT, u">>"):
62
57
            assert len(args) >= 2
63
58
            file = args[1].clone()
64
59
            args = args[3:] # Strip a possible comma after the file expression
65
60
        # Now synthesize a print(args, sep=..., end=..., file=...) node.
66
61
        l_args = [arg.clone() for arg in args]
67
62
        if l_args:
68
 
            l_args[0].set_prefix("")
 
63
            l_args[0].prefix = u""
69
64
        if sep is not None or end is not None or file is not None:
70
65
            if sep is not None:
71
 
                self.add_kwarg(l_args, "sep", String(repr(sep)))
 
66
                self.add_kwarg(l_args, u"sep", String(repr(sep)))
72
67
            if end is not None:
73
 
                self.add_kwarg(l_args, "end", String(repr(end)))
 
68
                self.add_kwarg(l_args, u"end", String(repr(end)))
74
69
            if file is not None:
75
 
                self.add_kwarg(l_args, "file", file)
76
 
        n_stmt = Call(Name("print"), l_args)
77
 
        n_stmt.set_prefix(node.get_prefix())
 
70
                self.add_kwarg(l_args, u"file", file)
 
71
        n_stmt = Call(Name(u"print"), l_args)
 
72
        n_stmt.prefix = node.prefix
78
73
        return n_stmt
79
74
 
80
75
    def add_kwarg(self, l_nodes, s_kwd, n_expr):
81
76
        # XXX All this prefix-setting may lose comments (though rarely)
82
 
        n_expr.set_prefix("")
 
77
        n_expr.prefix = u""
83
78
        n_argument = pytree.Node(self.syms.argument,
84
79
                                 (Name(s_kwd),
85
 
                                  pytree.Leaf(token.EQUAL, "="),
 
80
                                  pytree.Leaf(token.EQUAL, u"="),
86
81
                                  n_expr))
87
82
        if l_nodes:
88
83
            l_nodes.append(Comma())
89
 
            n_argument.set_prefix(" ")
 
84
            n_argument.prefix = u" "
90
85
        l_nodes.append(n_argument)