Merged revisions 72491-72493 via svnmerge from

svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r72491 | benjamin.peterson | 2009-05-08 19:33:27 -0500 (Fri, 08 May 2009) | 7 lines

  make 2to3 use unicode internally on 2.x

  This started out as a fix for #2660, but became this large refactoring
  when I realized the dire state this was in. 2to3 now uses
  tokenize.detect_encoding to decode the files correctly into unicode.
........
  r72492 | benjamin.peterson | 2009-05-08 19:35:38 -0500 (Fri, 08 May 2009) | 1 line

  remove compat code
........
  r72493 | benjamin.peterson | 2009-05-08 19:54:15 -0500 (Fri, 08 May 2009) | 1 line

  add a test for \r\n newlines
........

1 files changed, 11 insertions, 11 deletions

diff --git a/Lib/lib2to3/fixes/fix_print.py b/Lib/lib2to3/fixes/fix_print.py
index 134a972..d3aa974 100644
--- a/Lib/lib2to3/fixes/fix_print.py
+++ b/Lib/lib2to3/fixes/fix_print.py
@@ -44,10 +44,10 @@ class FixPrint(fixer_base.ConditionalFix):
 
         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.get_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
@@ -58,33 +58,33 @@ class FixPrint(fixer_base.ConditionalFix):
         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].set_prefix("")
+            l_args[0].set_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.set_prefix(node.get_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.set_prefix("")
+        n_expr.set_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.set_prefix(" ")
+            n_argument.set_prefix(u" ")
         l_nodes.append(n_argument)