8000 ENH: make is_list_like handle non iterable numpy-like arrays correctly by znicholls · Pull Request #35127 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

ENH: make is_list_like handle non iterable numpy-like arrays correctly #35127

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

Closed
wants to merge 12 commits into from
Closed

ENH: make is_list_like handle non iterable numpy-like arrays correctly #35127

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0ecb8c2
Add failing test
znicholls Feb 13, 2021
ad5f714
Add __array__ method to mock numpy-like
znicholls Feb 13, 2021
139493f
TST: GH35131 Add failing test of numpy-like array handling
znicholls Jul 5, 2020
ba59fb8
ENH: GH35131 Implement fix which allows numpy-like handling
znicholls Jul 5, 2020
451fbfc
Simplify ndim check
znicholls Jul 5, 2020
57e186b
Revert change because it broke tests
znicholls Jul 6, 2020
590c2a2
Use slightly clearer logic
znicholls Jul 6, 2020
27bd4e4
Update to use numpy iterable
znicholls Jul 7, 2020
d9a2c8f
Add failing is_scalar tests
znicholls Jul 7, 2020
764e7b1
Revert to relying on python's shortcircuit operators
znicholls Jul 7, 2020
088dff8
Make a mess
znicholls Feb 13, 2021
928842f
Fix missing module
znicholls Feb 13, 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
Prev Previous commit
Next Next commit
Make a mess
  • Loading branch information
@znicholls
znicholls committed Feb 13, 2021
commit 088dff81863047d9260a0daba7d2b0015cc4010b
1 change: 1 addition & 0 deletions pandas/_libs/testing.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ from pandas._libs.lib import is_complex
from pandas._libs.util cimport is_array, is_real_number_object

from pandas.core.dtypes.common import is_dtype_equal
from pandas.core.dtypes.inference import is_array_like
from pandas.core.dtypes.missing import array_equivalent, isna


Expand Down
5 changes: 5 additions & 0 deletions pandas/core/dtypes/missing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,11 @@ def array_equivalent(
# Slow path when we allow comparing different dtypes.
# Object arrays can contain None, NaN and NaT.
# string dtypes must be come to this path for NumPy 1.7.1 compat
try:
return np.array_equal(left, right)
except:
pass

if is_string_dtype(left.dtype) or is_string_dtype(right.dtype):
return _array_equivalent_object(left, right, strict_nan)

Expand Down
8 changes: 8 additions & 0 deletions pandas/tests/dtypes/test_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@ def test_is_array_like():
assert inference.is_array_like(Series([1, 2]))
assert inference.is_array_like(np.array(["a", "b"]))
assert inference.is_array_like(Index(["2016-01-01"]))
assert inference.is_array_like(np.array([2, 3]))
assert inference.is_array_like(MockNumpyLikeArray(np.array([2, 3])))

class DtypeList(list):
dtype = "special"
Expand All @@ -221,6 +223,12 @@ class DtypeList(list):
assert not inference.is_array_like(123)


def test_assert_almost_equal():
tm.assert_almost_equal(np.array(2), np.array(2))
eg = MockNumpyLikeArray(np.array(2))
tm.assert_almost_equal(eg, eg)


@pytest.mark.parametrize(
"eg",
(
Expand Down
0