Skip to content

COMPAT: Use actual isinstance check for pyarrow.Array instead of hasattr(.. 'type') duck typing #52830

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 10 commits into from
Jun 2, 2023
Merged

COMPAT: Use actual isinstance check for pyarrow.Array instead of hasattr(.. 'type') duck typing #52830

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b501de7
Use actual isinstance check for pyarrow.Array instead of hasattr(.. '…
jorisvandenbossche Apr 21, 2023
0ffc29b
Merge remote-tracking branch 'upstream/main' into pyarrow-compat
jorisvandenbossche Apr 21, 2023
6ec3d34
fix import
jorisvandenbossche Apr 21, 2023
7bff616
Merge remote-tracking branch 'upstream/main' into pyarrow-compat
jorisvandenbossche Apr 28, 2023
3c88833
move to cython
jorisvandenbossche Apr 28, 2023
2448fd6
add docstring
jorisvandenbossche Apr 28, 2023
564c912
try TypeGuard
jorisvandenbossche Apr 28, 2023
2e92c5a
Merge remote-tracking branch 'upstream/main' into pyarrow-compat
jorisvandenbossche May 8, 2023
6999bec
Merge remote-tracking branch 'upstream/main' into pyarrow-compat
jorisvandenbossche May 31, 2023
c8aa952
remove ArrowArrayTypeGuard
jorisvandenbossche May 31, 2023
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
2 changes: 2 additions & 0 deletions pandas/compat/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import pandas.compat.compressors
from pandas.compat.numpy import is_numpy_dev
from pandas.compat.pyarrow import (
is_pyarrow_array,
pa_version_under7p0,
pa_version_under8p0,
pa_version_under9p0,
Expand Down Expand Up @@ -156,6 +157,7 @@ def get_lzma_file() -> type[pandas.compat.compressors.LZMAFile]:

__all__ = [
"is_numpy_dev",
"is_pyarrow_array",
"pa_version_under7p0",
"pa_version_under8p0",
"pa_version_under9p0",
Expand Down
14 changes: 14 additions & 0 deletions pandas/compat/pyarrow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

from pandas.util.version import Version

PYARROW_INSTALLED = None

try:
import pyarrow as pa

Expand All @@ -14,9 +16,21 @@
pa_version_under9p0 = _palv < Version("9.0.0")
pa_version_under10p0 = _palv < Version("10.0.0")
pa_version_under11p0 = _palv < Version("11.0.0")

PYARROW_INSTALLED = True
except ImportError:
pa = None

pa_version_under7p0 = True
pa_version_under8p0 = True
pa_version_under9p0 = True
pa_version_under10p0 = True
pa_version_under11p0 = True

PYARROW_INSTALLED = False


def is_pyarrow_array(obj) -> bool:
if PYARROW_INSTALLED:
return isinstance(obj, (pa.Array, pa.ChunkedArray))
return False
7 changes: 5 additions & 2 deletions pandas/core/arrays/string_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
missing as libmissing,
)
from pandas._libs.arrays import NDArrayBacked
from pandas.compat import pa_version_under7p0
from pandas.compat import (
is_pyarrow_array,
pa_version_under7p0,
)
from pandas.compat.numpy import function as nv
from pandas.util._decorators import doc

Expand Down Expand Up @@ -356,7 +359,7 @@ def _from_sequence(cls, scalars, *, dtype: Dtype | None = None, copy: bool = Fal
result[na_values] = libmissing.NA

else:
if hasattr(scalars, "type"):
if is_pyarrow_array(scalars):
# pyarrow array; we cannot rely on the "to_numpy" check in
# ensure_string_array because calling scalars.to_numpy would set
# zero_copy_only to True which caused problems see GH#52076
Expand Down