Skip to content

BUG: fix wrong error message in deprecated 2D indexing of Series with datetime values #38099

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 9 commits into from
Dec 1, 2020
Merged

BUG: fix wrong error message in deprecated 2D indexing of Series with datetime values #38099

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f55f514
BUG: fix wrong error message in deprecated 2D indexing of Series with…
jorisvandenbossche Nov 26, 2020
a2cf40f
avoid catching AssertionError
jorisvandenbossche Nov 26, 2020
32436e4
Merge remote-tracking branch 'upstream/master' into regr-2d-indexing-…
jorisvandenbossche Nov 27, 2020
95df80a
clarify comment
jorisvandenbossche Nov 27, 2020
8bf5ae4
Merge remote-tracking branch 'upstream/master' into regr-2d-indexing-…
jorisvandenbossche Nov 30, 2020
df0f6a2
update test
jorisvandenbossche Nov 30, 2020
61e7731
fixup
jorisvandenbossche Nov 30, 2020
6391f54
add whatsnew
jorisvandenbossche Nov 30, 2020
e44bf53
Revert "add whatsnew" - wrong PR
jorisvandenbossche Nov 30, 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
18 changes: 18 additions & 0 deletions pandas/core/internals/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2382,6 +2382,24 @@ def quantile(self, qs, interpolation="linear", axis=0):
aware = self._holder(res_blk.values.ravel(), dtype=self.dtype)
return self.make_block_same_class(aware, ndim=res_blk.ndim)

def _check_ndim(self, values, ndim):
"""
ndim inference and validation.

This is overriden by the DatetimeTZBlock to check the case of 2D
data (values.ndim == 2), which should only be allowed if ndim is
also 2.
"""
if ndim is None:
Copy link
Member

Choose a reason for hiding this comment

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

we recently started always-passing ndim to the constructor, so should never have None here

Copy link
Contributor

Choose a reason for hiding this comment

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

this is backported though, so prob ok (but will need a patch on 1.2)

Copy link
Member Author

Choose a reason for hiding this comment

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

This is also done in the parent method, so can use a general clean-up for 1.2

Copy link
Contributor

Choose a reason for hiding this comment

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

kk can you open an issue so we don't forget to do this

ndim = values.ndim

if values.ndim > ndim:
raise ValueError(
"Wrong number of dimensions. "
f"values.ndim != ndim [{values.ndim} != {ndim}]"
)
return ndim


class TimeDeltaBlock(DatetimeLikeBlockMixin):
__slots__ = ()
Expand Down
3 changes: 2 additions & 1 deletion pandas/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,8 @@ def _get_values(self, indexer):
except ValueError:
# mpl compat if we look up e.g. ser[:, np.newaxis];
# see tests.series.timeseries.test_mpl_compat_hack
return self._values[indexer]
# the asarray is needed to avoid returning a 2D DatetimeArray
return np.asarray(self._values[indexer])

def _get_value(self, label, takeable: bool = False):
"""
Expand Down
15 changes: 12 additions & 3 deletions pandas/tests/series/indexing/test_getitem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,10 +389,19 @@ def test_getitem_generator(string_series):
tm.assert_series_equal(result2, expected)


def test_getitem_ndim_deprecated():
s = Series([0, 1])
@pytest.mark.parametrize(
"series",
[
Series([0, 1]),
Series(date_range("2012-01-01", periods=2)),
Series(date_range("2012-01-01", periods=2, tz="CET")),
],
)
def test_getitem_ndim_deprecated(series):
with tm.assert_produces_warning(FutureWarning):
s[:, None]
res = series[:, None]
Copy link
Contributor

Choose a reason for hiding this comment

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

prob worth testing the actual message (can pass to assert_produces_warning to prevent regressions.


assert isinstance(res, np.ndarray)
Copy link
Contributor

Choose a reason for hiding this comment

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

can you assert the result arrays (parameterize if needed)



def test_getitem_multilevel_scalar_slice_not_implemented(
Expand Down