Skip to content
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

Update io util to convert path like object to string #8275

Merged
merged 2 commits into from
May 19, 2021
Merged

Update io util to convert path like object to string #8275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
689af42
Replace use of stringigy_path with check for fsspath attribute
ayushdg May 18, 2021
4a7c652
Add stringify_pathlike as a helper in ioutils
ayushdg May 18, 2021
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
3 changes: 1 addition & 2 deletions python/cudf/cudf/io/parquet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from uuid import uuid4

from fsspec.core import get_fs_token_paths
from fsspec.utils import stringify_path
from pyarrow import dataset as ds, parquet as pq

import cudf
Expand Down Expand Up @@ -203,7 +202,7 @@ def read_parquet(
for source in filepath_or_buffer:
if ioutils.is_directory(source, **kwargs):
fs = _ensure_filesystem(passed_filesystem=None, path=source)
source = stringify_path(source)
source = ioutils.stringify_pathlike(source)
source = fs.sep.join([source, "*.parquet"])

tmp_source, compression = ioutils.get_filepath_or_buffer(
Expand Down
27 changes: 24 additions & 3 deletions python/cudf/cudf/utils/ioutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,7 @@ def _is_local_filesystem(fs):
def ensure_single_filepath_or_buffer(path_or_data, **kwargs):
"""Return False if `path_or_data` resolves to multiple filepaths or buffers
"""
path_or_data = fsspec.utils.stringify_path(path_or_data)
path_or_data = stringify_pathlike(path_or_data)
if isinstance(path_or_data, str):
storage_options = kwargs.get("storage_options")
path_or_data = os.path.expanduser(path_or_data)
Expand All @@ -1076,7 +1076,7 @@ def ensure_single_filepath_or_buffer(path_or_data, **kwargs):
def is_directory(path_or_data, **kwargs):
"""Returns True if the provided filepath is a directory
"""
path_or_data = fsspec.utils.stringify_path(path_or_data)
path_or_data = stringify_pathlike(path_or_data)
if isinstance(path_or_data, str):
storage_options = kwargs.get("storage_options")
path_or_data = os.path.expanduser(path_or_data)
Expand Down Expand Up @@ -1121,7 +1121,7 @@ def get_filepath_or_buffer(
compression : str
Type of compression algorithm for the content
"""
path_or_data = fsspec.utils.stringify_path(path_or_data)
path_or_data = stringify_pathlike(path_or_data)

if isinstance(path_or_data, str):
storage_options = kwargs.get("storage_options")
Expand Down Expand Up @@ -1223,6 +1223,27 @@ def is_fsspec_open_file(file_obj):
return False


def stringify_pathlike(pathlike):
"""
Convert any object that implements the fspath protocol
to a string. Leaves other objects unchanged
Parameters
----------
pathlike
Pathlike object that implements the fspath protocol

Returns
-------
maybe_pathlike_str
String version of the object if possible
"""
maybe_pathlike_str = (
pathlike.__fspath__() if hasattr(pathlike, "__fspath__") else pathlike
)

return maybe_pathlike_str


def buffer_write_lines(buf, lines):
"""
Appends lines to a buffer.
Expand Down