bpo-31281: Fix pathlib.Path incompatibility in fileinput #3208
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ericvsmith
reviewed
Aug 27, 2017
Lib/fileinput.py
Outdated
| @@ -330,7 +330,7 @@ def _readline(self): | |||
| else: | |||
| if self._inplace: | |||
| self._backupfilename = ( | |||
| self._filename + (self._backup or ".bak")) | |||
| str(self._filename) + (self._backup or ".bak")) | |||
There was a problem hiding this comment.
os.fspath is preferred over str().
There was a problem hiding this comment.
@ericvsmith Updated.
zmwangx
force-pushed
the
fileinput-pathlib-inplace
branch
from
35ef435 to
10792d1
Compare
|
This also needs tests. I don't know what the existing tests look like. |
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.
zmwangx
force-pushed
the
fileinput-pathlib-inplace
branch
from
10792d1 to
590e228
Compare
|
@ericvsmith I added a test. |
ericvsmith
approved these changes
Sep 4, 2017
jimmylai
pushed a commit
to jimmylai/cpython
that referenced
this pull request
Sep 4, 2017
* 'master' of https://github.com/python/cpython: (601 commits) remove check for bug last seem in Solaris 9 (python#3285) Change code owners for hashlib and ssl to the crypto team (python#3284) bpo-31281: Fix pathlib.Path incompatibility in fileinput (pythongh-3208) remove autoconf check for select() (python#3283) remove configure check for 'volatile' (python#3281) Add missing _sha3 module to Setup.dist (python#2395) bpo-12383: Also ignore __PYVENV_LAUNCHER__ (python#3278) bpo-9146: add the missing NEWS entry. (python#3275) Fix a c.f.as_completed() refleak previously introduced in bpo-27144 (python#3270) bpo-31185: Fixed miscellaneous errors in asyncio speedup module. (python#3076) remove a redundant lower in urllib.parse.urlsplit (python#3008) bpo-31323: Fix reference leak in test_ssl (python#3263) bpo-31250, test_asyncio: fix EventLoopTestsMixin.tearDown() (python#3264) bpo-31326: ProcessPoolExecutor waits for the call queue thread (python#3265) bpo-27144: concurrent.futures as_complete and map iterators do not keep reference to returned object (python#1560) bpo-31250, test_asyncio: fix dangling threads (python#3252) bpo-31217: Fix regrtest -R for small integer (python#3260) bpo-30096: Use ABC in abc reference examples (python#1220) bpo-30737: Update DevGuide links to new URL (pythonGH-3228) [Trivial] Remove now redundant assert (python#3245) ...
GadgetSteve
pushed a commit
to GadgetSteve/cpython
that referenced
this pull request
Sep 10, 2017
Fix fileinput with inplace=True to accept pathlib.Path objects.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fileinputotherwise works fine withpathlib.Pathfilenames, but wheninplaceis set toTrue, thePathobject needs to be converted to astrfirst, or appending astrsuffix with+would fail:=>
https://bugs.python.org/issue31281