diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-09-16 00:11:26 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-09-16 00:11:26 (GMT) |
| commit | 2beb413784e116d8396a7146d6106150eb59f40c (patch) | |
| tree | 79cd6f4e1b09f61d2a145cc87baf0a9f9cf51c0a | |
| parent | d62269f9207ca9ac539c9216a9b41cab4f62d5e4 (diff) | |
| download | cpython-2beb413784e116d8396a7146d6106150eb59f40c.zip cpython-2beb413784e116d8396a7146d6106150eb59f40c.tar.gz cpython-2beb413784e116d8396a7146d6106150eb59f40c.tar.bz2 | |
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
........
................
| -rw-r--r-- | Lib/lib2to3/fixes/fix_metaclass.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/lib2to3/fixes/fix_metaclass.py b/Lib/lib2to3/fixes/fix_metaclass.py index e291dd7..7479024 100644 --- a/Lib/lib2to3/fixes/fix_metaclass.py +++ b/Lib/lib2to3/fixes/fix_metaclass.py @@ -17,8 +17,6 @@ """ # Author: Jack Diederich -import os - # Local imports from .. import fixer_base from ..pygram import token @@ -216,7 +214,7 @@ class FixMetaclass(fixer_base.BaseFix): 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 @@ class FixMetaclass(fixer_base.BaseFix): # 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')) |