Skip to content

Remove py.path special handling from io.common #26458

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

Merged
merged 7 commits into from
May 26, 2019
Merged

Remove py.path special handling from io.common #26458

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7def892
Added DeprecationWarning for py.path.local
nandahkrishna May 19, 2019
f462cc2
Raise warning only if py.path used
nandahkrishna May 19, 2019
30d643c
Corrected import order
nandahkrishna May 19, 2019
6dffe48
Removed unwanted imports and checks
nandahkrishna May 19, 2019
022cd16
Used __fspath__() in return
nandahkrishna May 19, 2019
cb78cb9
Changes for 3.5
nandahkrishna May 20, 2019
45f0578
Move import
nandahkrishna May 25, 2019
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
17 changes: 2 additions & 15 deletions pandas/io/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import lzma
import mmap
import os
import pathlib
from urllib.error import URLError # noqa
from urllib.parse import ( # noqa
urlencode, urljoin, urlparse as parse_url, uses_netloc, uses_params,
Expand Down Expand Up @@ -115,24 +116,10 @@ def _stringify_path(filepath_or_buffer):
Any other object is passed through unchanged, which includes bytes,
strings, buffers, or anything else that's not even path-like.
"""
try:
import pathlib
_PATHLIB_INSTALLED = True
except ImportError:
_PATHLIB_INSTALLED = False

try:
from py.path import local as LocalPath
_PY_PATH_INSTALLED = True
except ImportError:
_PY_PATH_INSTALLED = False

if hasattr(filepath_or_buffer, '__fspath__'):
return filepath_or_buffer.__fspath__()
if _PATHLIB_INSTALLED and isinstance(filepath_or_buffer, pathlib.Path):
elif isinstance(filepath_or_buffer, pathlib.Path):
return str(filepath_or_buffer)
if _PY_PATH_INSTALLED and isinstance(filepath_or_buffer, LocalPath):
return filepath_or_buffer.strpath
return _expand_user(filepath_or_buffer)


Expand Down