mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-34108: Fix double carriage return in 2to3 on Windows (#8271)

Browse source 
* Add test capturing failure.
* Honor newlines as present in the original file.
This commit is contained in:
Jason R. Coombs 2018-07-13 11:26:03 -04:00 • committed by GitHub
parent 379e9d639a
commit cafaf0447b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/lib2to3/refactor.py
View file

@ -514,7 +514,7 @@ class RefactoringTool(object):
set. set.
""" """
try: try:
fp = io.open(filename, "w", encoding=encoding) fp = io.open(filename, "w", encoding=encoding, newline='')
except OSError as err: except OSError as err:
self.log_error("Can't create %s: %s", filename, err) self.log_error("Can't create %s: %s", filename, err)
return return

1
Lib/lib2to3/tests/test_refactor.py
View file

@ -300,6 +300,7 @@ from __future__ import print_function"""
old, new = self.refactor_file(fn) old, new = self.refactor_file(fn)
self.assertIn(b"\r\n", old) self.assertIn(b"\r\n", old)
self.assertIn(b"\r\n", new) self.assertIn(b"\r\n", new)
self.assertNotIn(b"\r\r\n", new)
def test_refactor_docstring(self): def test_refactor_docstring(self):
rt = self.rt() rt = self.rt()

1
Misc/NEWS.d/next/Library/2018-07-13-08-44-52.bpo-34108.RjobUC.rst Normal file
View file

@ -0,0 +1 @@
Remove extraneous CR in 2to3 refactor.