mirror of
https://github.com/python/cpython
synced 2024-09-05 08:17:45 +00:00
gh-93157: Fix fileinput didn't support errors
in inplace
mode (GH-95128)
This commit is contained in:
parent
a2fbc51198
commit
5c7f3bcdaf
|
@ -335,18 +335,21 @@ def _readline(self):
|
|||
pass
|
||||
# The next few lines may raise OSError
|
||||
os.rename(self._filename, self._backupfilename)
|
||||
self._file = open(self._backupfilename, self._mode, encoding=encoding)
|
||||
self._file = open(self._backupfilename, self._mode,
|
||||
encoding=encoding, errors=self._errors)
|
||||
try:
|
||||
perm = os.fstat(self._file.fileno()).st_mode
|
||||
except OSError:
|
||||
self._output = open(self._filename, self._write_mode, encoding=encoding)
|
||||
self._output = open(self._filename, self._write_mode,
|
||||
encoding=encoding, errors=self._errors)
|
||||
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, self._write_mode, encoding=encoding)
|
||||
self._output = os.fdopen(fd, self._write_mode,
|
||||
encoding=encoding, errors=self._errors)
|
||||
try:
|
||||
os.chmod(self._filename, perm)
|
||||
except OSError:
|
||||
|
|
|
@ -326,6 +326,16 @@ def test_inplace_binary_write_mode(self):
|
|||
with open(temp_file, 'rb') as f:
|
||||
self.assertEqual(f.read(), b'New line.')
|
||||
|
||||
def test_inplace_encoding_errors(self):
|
||||
temp_file = self.writeTmp(b'Initial text \x88', mode='wb')
|
||||
with FileInput(temp_file, inplace=True,
|
||||
encoding="ascii", errors="replace") as fobj:
|
||||
line = fobj.readline()
|
||||
self.assertEqual(line, 'Initial text \ufffd')
|
||||
print("New line \x88")
|
||||
with open(temp_file, 'rb') as f:
|
||||
self.assertEqual(f.read().rstrip(b'\r\n'), b'New line ?')
|
||||
|
||||
def test_file_hook_backward_compatibility(self):
|
||||
def old_hook(filename, mode):
|
||||
return io.StringIO("I used to receive only filename and mode")
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Fix :mod:`fileinput` module didn't support ``errors`` option when
|
||||
``inplace`` is true.
|
Loading…
Reference in a new issue