Skip to content

Commit

Permalink
[SPARK-37730][PYTHON] Replace use of MPLPlot._add_legend_handle with …
Browse files Browse the repository at this point in the history
…MPLPlot._append_legend_handles_labels

### What changes were proposed in this pull request?

Replace use of MPLPlot._add_legend_handle (removed in pandas) with MPLPlot._append_legend_handles_labels in histogram and KDE plots.
Based on:  pandas-dev/pandas@029907c

### Why are the changes needed?

Fix of SPARK-37730. plot.hist and plot.kde don't throw AttributeError for pandas=1.3.5.

### Does this PR introduce _any_ user-facing change?
No

### How was this patch tested?

~~Tested with existing plot test on CI (for older pandas only).~~ (it seems that CI doesn't run matplotlib tests, see #35000 (comment))

I've run tests on a local computer, see #35000 (comment) :
```
$ python python/pyspark/pandas/tests/plot/test_series_plot_matplotlib.py
```

:question: **QUESTION:** Maybe add plot testing for pandas 1.3.5 on CI? (I've noticed that CI uses `pandas=1.3.4`, maybe update it to `1.3.5`?)

Closes #35000 from mslapek/fixpythonplot.

Authored-by: Michał Słapek <[email protected]>
Signed-off-by: Hyukjin Kwon <[email protected]>
(cherry picked from commit 371e307)
Signed-off-by: Dongjoon Hyun <[email protected]>
  • Loading branch information
mslapek authored and dongjoon-hyun committed Jul 10, 2022
1 parent c5983c1 commit bc54a3f
Showing 1 changed file with 20 additions and 2 deletions.
22 changes: 20 additions & 2 deletions python/pyspark/pandas/plot/matplotlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,12 @@ def _make_plot(self):
kwds = self.kwds.copy()

label = pprint_thing(label if len(label) > 1 else label[0])
# `if hasattr(...)` makes plotting compatible with pandas < 1.3, see pandas-dev/pandas#40078.
label = (
self._mark_right_label(label, index=i)
if hasattr(self, "_mark_right_label")
else label
)
kwds["label"] = label

style, kwds = self._apply_style_colors(colors, kwds, i, label)
Expand All @@ -400,7 +406,10 @@ def _make_plot(self):

kwds = self._make_plot_keywords(kwds, y)
artists = self._plot(ax, y, column_num=i, stacking_id=stacking_id, **kwds)
self._add_legend_handle(artists[0], label, index=i)
# `if hasattr(...)` makes plotting compatible with pandas < 1.3, see pandas-dev/pandas#40078.
self._append_legend_handles_labels(artists[0], label) if hasattr(
self, "_append_legend_handles_labels"
) else self._add_legend_handle(artists[0], label, index=i)

@classmethod
def _plot(cls, ax, y, style=None, bins=None, bottom=0, column_num=0, stacking_id=None, **kwds):
Expand Down Expand Up @@ -483,6 +492,12 @@ def _make_plot(self):
kwds = self.kwds.copy()

label = pprint_thing(label if len(label) > 1 else label[0])
# `if hasattr(...)` makes plotting compatible with pandas < 1.3, see pandas-dev/pandas#40078.
label = (
self._mark_right_label(label, index=i)
if hasattr(self, "_mark_right_label")
else label
)
kwds["label"] = label

style, kwds = self._apply_style_colors(colors, kwds, i, label)
Expand All @@ -491,7 +506,10 @@ def _make_plot(self):

kwds = self._make_plot_keywords(kwds, y)
artists = self._plot(ax, y, column_num=i, stacking_id=stacking_id, **kwds)
self._add_legend_handle(artists[0], label, index=i)
# `if hasattr(...)` makes plotting compatible with pandas < 1.3, see pandas-dev/pandas#40078.
self._append_legend_handles_labels(artists[0], label) if hasattr(
self, "_append_legend_handles_labels"
) else self._add_legend_handle(artists[0], label, index=i)

def _get_ind(self, y):
return KdePlotBase.get_ind(y, self.ind)
Expand Down

0 comments on commit bc54a3f

Please sign in to comment.