Skip to content

FIX: stop supporting strange pandas #22128

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 1 commit into from
Closed

FIX: stop supporting strange pandas #22128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions lib/matplotlib/axes/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from matplotlib import _api, cbook, docstring, offsetbox
import matplotlib.artist as martist
import matplotlib.axis as maxis
from matplotlib.cbook import _OrderedSet, _check_1d, index_of
from matplotlib.cbook import _OrderedSet, index_of
import matplotlib.collections as mcoll
import matplotlib.colors as mcolors
import matplotlib.font_manager as font_manager
Expand Down Expand Up @@ -484,8 +484,8 @@ def _plot_args(self, tup, kwargs, return_kwargs=False):
kw[prop_name] = val

if len(xy) == 2:
x = _check_1d(xy[0])
y = _check_1d(xy[1])
x = np.atleast_1d(xy[0])
y = np.atleast_1d(xy[1])
else:
x, y = index_of(xy[-1])

Expand Down
44 changes: 2 additions & 42 deletions lib/matplotlib/cbook/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,47 +1300,7 @@ def _to_unmasked_float_array(x):

def _check_1d(x):
"""Convert scalars to 1D arrays; pass-through arrays as is."""
if not hasattr(x, 'shape') or len(x.shape) < 1:
return np.atleast_1d(x)
else:
try:
# work around
# https://github.com/pandas-dev/pandas/issues/27775 which
# means the shape of multi-dimensional slicing is not as
# expected. That this ever worked was an unintentional
# quirk of pandas and will raise an exception in the
# future. This slicing warns in pandas >= 1.0rc0 via
# https://github.com/pandas-dev/pandas/pull/30588
#
# < 1.0rc0 : x[:, None].ndim == 1, no warning, custom type
# >= 1.0rc1 : x[:, None].ndim == 2, warns, numpy array
# future : x[:, None] -> raises
#
# This code should correctly identify and coerce to a
# numpy array all pandas versions.
with warnings.catch_warnings(record=True) as w:
warnings.filterwarnings(
"always",
category=Warning,
message='Support for multi-dimensional indexing')

ndim = x[:, None].ndim
# we have definitely hit a pandas index or series object
# cast to a numpy array.
if len(w) > 0:
return np.asanyarray(x)
# We have likely hit a pandas object, or at least
# something where 2D slicing does not result in a 2D
# object.
if ndim < 2:
return np.atleast_1d(x)
return x
# In pandas 1.1.0, multidimensional indexing leads to an
# AssertionError for some Series objects, but should be
# IndexError as described in
# https://github.com/pandas-dev/pandas/issues/35527
except (AssertionError, IndexError, TypeError):
return np.atleast_1d(x)
return np.atleast_1d(x)


def _reshape_2D(X, name):
Expand Down Expand Up @@ -1653,7 +1613,7 @@ def index_of(y):
except AttributeError:
pass
try:
y = _check_1d(y)
y = np.atleast_1d(y)
except (np.VisibleDeprecationWarning, ValueError):
# NumPy 1.19 will warn on ragged input, and we can't actually use it.
pass
Expand Down