[Python-3000-checkins] r66474 - in python/branches/py3k/Lib/lib2to3: fixes/fix_metaclass.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Tue Sep 16 02:11:26 2008
New Revision: 66474

Log:
Merged revisions 66473 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r66473 | benjamin.peterson | 2008-09-15 18:55:01 -0500 (Mon, 15 Sep 2008) | 9 lines
  
  Merged revisions 66470 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  
  ........
    r66470 | benjamin.peterson | 2008-09-15 18:29:43 -0500 (Mon, 15 Sep 2008) | 1 line
    
    don't use os.linesep for newlines; it breaks tests on windows
  ........
................


Modified:
   python/branches/py3k/Lib/lib2to3/   (props changed)
   python/branches/py3k/Lib/lib2to3/fixes/fix_metaclass.py

Modified: python/branches/py3k/Lib/lib2to3/fixes/fix_metaclass.py
==============================================================================
--- python/branches/py3k/Lib/lib2to3/fixes/fix_metaclass.py	(original)
+++ python/branches/py3k/Lib/lib2to3/fixes/fix_metaclass.py	Tue Sep 16 02:11:26 2008
@@ -17,8 +17,6 @@
 """
 # Author: Jack Diederich
 
-import os
-
 # Local imports
 from .. import fixer_base
 from ..pygram import token
@@ -216,7 +214,7 @@
             pass_leaf = Leaf(text_type, 'pass')
             pass_leaf.set_prefix(orig_meta_prefix)
             node.append_child(pass_leaf)
-            node.append_child(Leaf(token.NEWLINE, os.linesep))
+            node.append_child(Leaf(token.NEWLINE, '\n'))
 
         elif len(suite.children) > 1 and \
                  (suite.children[-2].type == token.INDENT and
@@ -224,4 +222,4 @@
             # there was only one line in the class body and it was __metaclass__
             pass_leaf = Leaf(text_type, 'pass')
             suite.insert_child(-1, pass_leaf)
-            suite.insert_child(-1, Leaf(token.NEWLINE, os.linesep))
+            suite.insert_child(-1, Leaf(token.NEWLINE, '\n'))