Improve Pandas conversion

Oscar Gustafsson · Oscar Gustafsson · commit a0488dfde80c · 2022-02-24T23:35:50.000+01:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -7907,8 +7907,8 @@ def violinplot(self, dataset, positions=None, vert=True, widths=0.5,
         """
 
         def _kde_method(X, coords):
-            if hasattr(X, 'values'):  # support pandas.Series
-                X = X.values
+            if hasattr(X, 'to_numpy'):  # support pandas.Series
+                X = X.to_numpy()
             # fallback gracefully if the vector contains only one value
             if np.all(X[0] == X):
                 return (X[0] == coords).astype(float)
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -437,9 +437,9 @@ def date2num(d):
     The Gregorian calendar is assumed; this is not universal practice.
     For details see the module docstring.
     """
-    if hasattr(d, "values"):
+    if hasattr(d, "to_numpy"):
         # this unpacks pandas series or dataframes...
-        d = d.values
+        d = d.to_numpy()
 
     # make an iterable, but save state to unpack later:
     iterable = np.iterable(d)
diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py
@@ -180,8 +180,8 @@ class Registry(dict):
 
     def get_converter(self, x):
         """Get the converter interface instance for *x*, or None."""
-        if hasattr(x, "values"):
-            x = x.values  # Unpack pandas Series and DataFrames.
+        if hasattr(x, "to_numpy"):
+            x = x.to_numpy()  # Unpack pandas Series and DataFrames.
         if isinstance(x, np.ndarray):
             # In case x in a masked array, access the underlying data (only its
             # type matters).  If x is a regular ndarray, getdata() just returns
