Change get_subplotspec and handles changes

Author: mroeschke

pandas/plotting/_matplotlib/core.py

@@ -784,8 +784,8 @@ def _make_legend(self) -> None:
         if not self.subplots:
             if leg is not None:
                 title = leg.get_title().get_text()
-                # Replace leg.LegendHandles because it misses marker info
-                handles = leg.legendHandles
+                # Replace leg.legend_handles because it misses marker info
+                handles = leg.legend_handles
                 labels = [x.get_text() for x in leg.get_texts()]
 
             if self.legend:

pandas/plotting/_matplotlib/tools.py

@@ -390,44 +390,50 @@ def handle_shared_axes(
     sharey: bool,
 ) -> None:
     if nplots > 1:
-        row_num = lambda x: x.get_subplotspec().rowspan.start
-        col_num = lambda x: x.get_subplotspec().colspan.start
-
-        is_first_col = lambda x: x.get_subplotspec().is_first_col()
-
         if nrows > 1:
             try:
                 # first find out the ax layout,
                 # so that we can correctly handle 'gaps"
                 layout = np.zeros((nrows + 1, ncols + 1), dtype=np.bool_)
                 for ax in axarr:
-                    layout[row_num(ax), col_num(ax)] = ax.get_visible()
+                    spec = ax.get_subplotspec()
+                    if spec is not None:
+                        layout[
+                            spec.rowspan.start, spec.colspan.start
+                        ] = ax.get_visible()
 
                 for ax in axarr:
+                    spec = ax.get_subplotspec()
+                    if spec is None:
+                        continue
                     # only the last row of subplots should get x labels -> all
                     # other off layout handles the case that the subplot is
                     # the last in the column, because below is no subplot/gap.
-                    if not layout[row_num(ax) + 1, col_num(ax)]:
+                    if not layout[spec.rowspan.start + 1, spec.colspan.start]:
                         continue
                     if sharex or _has_externally_shared_axis(ax, "x"):
                         _remove_labels_from_axis(ax.xaxis)
 
             except IndexError:
                 # if gridspec is used, ax.rowNum and ax.colNum may different
                 # from layout shape. in this case, use last_row logic
-                is_last_row = lambda x: x.get_subplotspec().is_last_row()
-                for ax in axarr:
-                    if is_last_row(ax):
-                        continue
-                    if sharex or _has_externally_shared_axis(ax, "x"):
-                        _remove_labels_from_axis(ax.xaxis)
+                spec = ax.get_subplotspec()
+                if spec is not None:
+                    for ax in axarr:
+                        if spec.is_last_row():
+                            continue
+                        if sharex or _has_externally_shared_axis(ax, "x"):
+                            _remove_labels_from_axis(ax.xaxis)
 
         if ncols > 1:
             for ax in axarr:
+                spec = ax.get_subplotspec()
+                if spec is None:
+                    continue
                 # only the first column should get y labels -> set all other to
                 # off as we only have labels in the first column and we always
                 # have a subplot there, we can skip the layout test
-                if is_first_col(ax):
+                if spec.is_first_col():
                     continue
                 if sharey or _has_externally_shared_axis(ax, "y"):
                     _remove_labels_from_axis(ax.yaxis)

pandas/tests/plotting/frame/test_frame_color.py

@@ -643,7 +643,7 @@ def test_colors_of_columns_with_same_name(self):
         df1 = DataFrame({"a": [2, 4, 6]})
         df_concat = pd.concat([df, df1], axis=1)
         result = df_concat.plot()
-        for legend, line in zip(result.get_legend().legendHandles, result.lines):
+        for legend, line in zip(result.get_legend().legend_handles, result.lines):
             assert legend.get_color() == line.get_color()
 
     def test_invalid_colormap(self):

pandas/tests/plotting/frame/test_frame_legend.py

@@ -28,7 +28,7 @@ def test_mixed_yerr(self):
         df.plot("x", "b", c="blue", yerr=None, ax=ax, label="blue")
 
         legend = ax.get_legend()
-        result_handles = legend.legendHandles
+        result_handles = legend.legend_handles
 
         assert isinstance(result_handles[0], LineCollection)
         assert isinstance(result_handles[1], Line2D)
@@ -41,7 +41,7 @@ def test_legend_false(self):
         ax = df.plot(legend=True, color={"a": "blue", "b": "green"}, secondary_y="b")
         df2.plot(legend=True, color={"d": "red"}, ax=ax)
         legend = ax.get_legend()
-        result = [handle.get_color() for handle in legend.legendHandles]
+        result = [handle.get_color() for handle in legend.legend_handles]
         expected = ["blue", "green", "red"]
         assert result == expected