Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
  ........
................
This commit is contained in:
Benjamin Peterson 2008-09-16 00:11:26 +00:00
parent d62269f920
commit 2beb413784
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/lib2to3/fixes/fix_metaclass.py
View File

@ -17,8 +17,6 @@
""" """
# Author: Jack Diederich # Author: Jack Diederich
import os
# Local imports # Local imports
from .. import fixer_base from .. import fixer_base
from ..pygram import token from ..pygram import token
@ -216,7 +214,7 @@ class FixMetaclass(fixer_base.BaseFix):
pass_leaf = Leaf(text_type, 'pass') pass_leaf = Leaf(text_type, 'pass')
pass_leaf.set_prefix(orig_meta_prefix) pass_leaf.set_prefix(orig_meta_prefix)
node.append_child(pass_leaf) 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 \ elif len(suite.children) > 1 and \
(suite.children[-2].type == token.INDENT and (suite.children[-2].type == token.INDENT and
@ -224,4 +222,4 @@ class FixMetaclass(fixer_base.BaseFix):
# there was only one line in the class body and it was __metaclass__ # there was only one line in the class body and it was __metaclass__
pass_leaf = Leaf(text_type, 'pass') pass_leaf = Leaf(text_type, 'pass')
suite.insert_child(-1, pass_leaf) suite.insert_child(-1, pass_leaf)
suite.insert_child(-1, Leaf(token.NEWLINE, os.linesep)) suite.insert_child(-1, Leaf(token.NEWLINE, '\n'))