From: Benjamin Peterson Date: Sat, 26 Mar 2011 23:11:54 +0000 (-0500) Subject: revert unintended changes X-Git-Tag: v2.7.2rc1~204 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c05568e06794ecc81410cc42f07e0295c4727f2;p=python revert unintended changes --- diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py index 30aea631b9..7d00d12f9d 100644 --- a/Lib/lib2to3/refactor.py +++ b/Lib/lib2to3/refactor.py @@ -500,7 +500,7 @@ class RefactoringTool(object): node = new def processed_file(self, new_text, filename, old_text=None, write=False, - encoding=None, newlines=None): + encoding=None): """ Called when a file has been refactored, and there are changes. """ diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py index ed75955139..3eecde8cfb 100644 --- a/Lib/lib2to3/tests/test_refactor.py +++ b/Lib/lib2to3/tests/test_refactor.py @@ -231,23 +231,6 @@ from __future__ import print_function""" os.path.join("a_dir", "stuff.py")] check(tree, tree) - def test_preserve_file_newlines(self): - rt = self.rt(fixers=_2TO3_FIXERS) - for nl in ("\r\n", "\n"): - data = "print y%s%syes%sok%s" % ((nl,) * 4) - handle, tmp = tempfile.mkstemp() - os.close(handle) - try: - with open(tmp, "w") as fp: - fp.write(data) - rt.refactor_file(tmp) - with open(tmp, "r") as fp: - contents = fp.read() - finally: - os.unlink(tmp) - for line in contents.splitlines(True): - self.assertTrue(line.endswith(nl)) - def test_file_encoding(self): fn = os.path.join(TEST_DATA_DIR, "different_encoding.py") self.check_file_refactoring(fn)