traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-1613500: Don't hardcode output file mode in fileinput.FileInput (GH-12986)

This commit is contained in:
Berker Peksag 2019-04-29 17:55:39 +03:00 committed by GitHub
parent 88c0937056
commit be6dbfb43b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/fileinput.py
View File

@ -222,6 +222,7 @@ class FileInput:
warnings.warn("'U' mode is deprecated",
DeprecationWarning, 2)
self._mode = mode
self._write_mode = mode.replace('r', 'w') if 'U' not in mode else 'w'
if openhook:
if inplace:
raise ValueError("FileInput cannot use an opening hook in inplace mode")
@ -348,14 +349,14 @@ class FileInput:
try:
perm = os.fstat(self._file.fileno()).st_mode
except OSError:
self._output = open(self._filename, "w")
self._output = open(self._filename, self._write_mode)
else:
mode = os.O_CREAT | os.O_WRONLY | os.O_TRUNC
if hasattr(os, 'O_BINARY'):
mode |= os.O_BINARY
fd = os.open(self._filename, mode, perm)
self._output = os.fdopen(fd, "w")
self._output = os.fdopen(fd, self._write_mode)
try:
os.chmod(self._filename, perm)
except OSError:

10
Lib/test/test_fileinput.py
View File

@ -329,6 +329,16 @@ class FileInputTests(BaseTests, unittest.TestCase):
self.assertEqual(fi.readline(), b'')
self.assertEqual(fi.readline(), b'')
def test_inplace_binary_write_mode(self):
temp_file = self.writeTmp(b'Initial text.', mode='wb')
with FileInput(temp_file, mode='rb', inplace=True) as fobj:
line = fobj.readline()
self.assertEqual(line, b'Initial text.')
# print() cannot be used with files opened in binary mode.
sys.stdout.write(b'New line.')
with open(temp_file, 'rb') as f:
self.assertEqual(f.read(), b'New line.')
def test_context_manager(self):
t1 = self.writeTmp("A\nB\nC")
t2 = self.writeTmp("D\nE\nF")

3
Misc/NEWS.d/next/Library/2019-04-27-21-09-33.bpo-1613500.Ogp4P0.rst Normal file
View File

@ -0,0 +1,3 @@
:class:`fileinput.FileInput` now uses the input file mode to correctly set
the output file mode (previously it was hardcoded to ``'w'``) when
``inplace=True`` is passed to its constructor.