Skip to content

bpo-30432: FileInput doesn't accept PathLike objects for file names #1732

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
May 23, 2017
Merged

bpo-30432: FileInput doesn't accept PathLike objects for file names #1732

merged 2 commits into from
May 23, 2017

Conversation

rowillia
Copy link
Contributor

@rowillia rowillia commented May 22, 2017 •
edited
Loading

FileInput fails if a single PathLike is passed in as files due to attempting to wrap it in a tuple:

Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/usr/local/Cellar/python3/3.6.0/Frameworks/Python.framework/Versions/3.6/lib/python3.6/fileinput.py", line 198, in __init__
    files = tuple(files)
TypeError: 'PosixPath' object is not iterable

Allow FileInput to accept a single PathLike object as a parameter for…
c1d3367 
… `files`

Fixes

bpo-30432: FileInput doesn't accept PathLike objects for file names
@rowillia rowillia force-pushed the fix_fileinput_and_pathlib branch from 9ab6156 to c1d3367 Compare May 22, 2017 23:08
@rowillia rowillia changed the title Allow FileInput to accept a single PathLike object as a parameter for files bpo-30432: FileInput doesn't accept PathLike objects for file names May 22, 2017
ambv
ambv approved these changes May 22, 2017
View reviewed changes
Copy link
Contributor

@ambv ambv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM save for nits. You can fix them if you feel like it.

Lib/fileinput.py Outdated
mode="r", openhook=None):
if isinstance(files, str):
files = (files,)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: spurious vertical whitespace

Lib/fileinput.py Outdated

elif isinstance(files, os.PathLike):
files = (os.fspath(files), )

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: ditto

Lib/test/test_fileinput.py Outdated
t1 = None
try:
t1 = Path(writeTmp(1, ["Pathlib file."]))
fi = FileInput(t1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: the other tests use with FileInput(...) so it gets closed even if an assertion fails.

@ambv ambv merged commit 002665a into python:master May 23, 2017
@ambv
Copy link
Contributor

ambv commented May 23, 2017

We need to update Misc/ACKS, this can be a separate pull request.

@ambv
Copy link
Contributor

ambv commented May 23, 2017

Thank you! ✨ 🍰 ✨

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ambv ambv ambv approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@rowillia @ambv