Skip to content

ERR: Raise a better error for numpy singletons in Index #33026

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 5 commits into from
Mar 26, 2020
Merged

ERR: Raise a better error for numpy singletons in Index #33026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fd117b
Flip order
dsaxton Mar 25, 2020
2203c6f
Test
dsaxton Mar 25, 2020
bc328b1
Sort
dsaxton Mar 25, 2020
88e195d
Add note
dsaxton Mar 26, 2020
6d9d5d1
Update pandas/tests/indexes/base_class/test_constructors.py
dsaxton Mar 26, 2020
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
1 change: 1 addition & 0 deletions doc/source/whatsnew/v1.1.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ Indexing
- Bug in :meth:`DataFrame.iloc.__setitem__` on a :class:`DataFrame` with duplicate columns incorrectly setting values for all matching columns (:issue:`15686`, :issue:`22036`)
- Bug in :meth:`DataFrame.loc:` and :meth:`Series.loc` with a :class:`DatetimeIndex`, :class:`TimedeltaIndex`, or :class:`PeriodIndex` incorrectly allowing lookups of non-matching datetime-like dtypes (:issue:`32650`)
- Bug in :meth:`Series.__getitem__` indexing with non-standard scalars, e.g. ``np.dtype`` (:issue:`32684`)
- Bug in :class:`Index` constructor where an unhelpful error message was raised for ``numpy`` scalars (:issue:`33017`)

Missing
^^^^^^^
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/indexes/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,10 @@ def __new__(
raise ValueError("Index data must be 1-dimensional")
return cls._simple_new(subarr, name)

elif hasattr(data, "__array__"):
return Index(np.asarray(data), dtype=dtype, copy=copy, name=name, **kwargs)
elif data is None or is_scalar(data):
raise cls._scalar_data_error(data)
elif hasattr(data, "__array__"):
return Index(np.asarray(data), dtype=dtype, copy=copy, name=name, **kwargs)
Copy link
Member Author

Choose a reason for hiding this comment

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

Just checking for scalars before testing for an __array__ attribute since things like np.array([1, 2])[0] pass both

else:
if tupleize_cols and is_list_like(data):
# GH21470: convert iterable to list before determining if empty
Expand Down
8 changes: 5 additions & 3 deletions pandas/tests/indexes/base_class/test_constructors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import numpy as np
import pytest

from pandas import Index, MultiIndex
Expand All @@ -7,14 +8,15 @@ class TestIndexConstructor:
# Tests for the Index constructor, specifically for cases that do
# not return a subclass

def test_constructor_corner(self):
@pytest.mark.parametrize("value", [1, np.int64(1)])
def test_constructor_corner(self, value):
# corner case
msg = (
r"Index\(\.\.\.\) must be called with a collection of some "
"kind, 0 was passed"
f"kind, {value} was passed"
)
with pytest.raises(TypeError, match=msg):
Index(0)
Index(value)

@pytest.mark.parametrize("index_vals", [[("A", 1), "B"], ["B", ("A", 1)]])
def test_construction_list_mixed_tuples(self, index_vals):
Expand Down