Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Lib/fileinput.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ def __init__(self, files=None, inplace=False, backup="", bufsize=0,
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")
Expand Down Expand Up @@ -348,14 +349,14 @@ def _readline(self):
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:
Expand Down
10 changes: 10 additions & 0 deletions Lib/test/test_fileinput.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,16 @@ def test_readline_binary_mode(self):
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")
Expand Down
Original file line number Diff line number Diff line change
@@ -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.