[Python-checkins] r66473 - in python/trunk/Lib/lib2to3: fixes/fix_metaclass.py

Tue Sep 16 01:55:01 CEST 2008

Author: benjamin.peterson
Date: Tue Sep 16 01:55:01 2008
New Revision: 66473
Log:
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 (2008年9月15日) | 1 line
 
 don't use os.linesep for newlines; it breaks tests on windows
........
Modified:
 python/trunk/Lib/lib2to3/ (props changed)
 python/trunk/Lib/lib2to3/fixes/fix_metaclass.py
Modified: python/trunk/Lib/lib2to3/fixes/fix_metaclass.py
==============================================================================

--- python/trunk/Lib/lib2to3/fixes/fix_metaclass.py	(original)
+++ python/trunk/Lib/lib2to3/fixes/fix_metaclass.py	Tue Sep 16 01:55:01 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'))
