From 590e22816849af9d8bd5f6d263c007594aef126c Mon Sep 17 00:00:00 2001 From: Zhiming Wang Date: Sat, 26 Aug 2017 10:17:01 +0800 Subject: [PATCH] bpo-31281: Fix pathlib.Path incompatibility in fileinput fileinput otherwise works fine with pathlib.Path filenames, but when inplace is set to True, the Path object needs to be converted to a str first, or appending a str suffix with + would fail. --- Lib/fileinput.py | 2 +- Lib/test/test_fileinput.py | 13 +++++++++++++ .../2017-08-29-07-14-14.bpo-31281.DcFyNs.rst | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2017-08-29-07-14-14.bpo-31281.DcFyNs.rst diff --git a/Lib/fileinput.py b/Lib/fileinput.py index 363c241c50e988..c6fc9a1981a1fa 100644 --- a/Lib/fileinput.py +++ b/Lib/fileinput.py @@ -330,7 +330,7 @@ def _readline(self): else: if self._inplace: self._backupfilename = ( - self._filename + (self._backup or ".bak")) + os.fspath(self._filename) + (self._backup or ".bak")) try: os.unlink(self._backupfilename) except OSError: diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py index 5df810c8f999b8..d7efc685d87e38 100644 --- a/Lib/test/test_fileinput.py +++ b/Lib/test/test_fileinput.py @@ -544,6 +544,19 @@ def test_pathlib_file(self): finally: remove_tempfiles(t1) + def test_pathlib_file_inplace(self): + t1 = None + try: + t1 = Path(writeTmp(1, ['Pathlib file.'])) + with FileInput(t1, inplace=True) as fi: + line = fi.readline() + self.assertEqual(line, 'Pathlib file.') + print('Modified %s' % line) + with open(t1) as f: + self.assertEqual(f.read(), 'Modified Pathlib file.\n') + finally: + remove_tempfiles(t1) + class MockFileInput: """A class that mocks out fileinput.FileInput for use during unit tests""" diff --git a/Misc/NEWS.d/next/Library/2017-08-29-07-14-14.bpo-31281.DcFyNs.rst b/Misc/NEWS.d/next/Library/2017-08-29-07-14-14.bpo-31281.DcFyNs.rst new file mode 100644 index 00000000000000..7fc8229cf47c17 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-08-29-07-14-14.bpo-31281.DcFyNs.rst @@ -0,0 +1,2 @@ +Fix ``fileinput.FileInput(files, inplace=True)`` when ``files`` contain +``pathlib.Path`` objects.