From d6346096909a89739dcaa1848f4f7f7f5c0ee496 Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Tue, 25 Jan 2022 08:53:27 +0100 Subject: [PATCH] Backport PR #22285: Don't warn on grid removal deprecation if grid is hidden --- lib/matplotlib/axes/_axes.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index 79e779608a0f..ad5f339dcdc7 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -5617,8 +5617,11 @@ def _interp_grid(X): return X, Y, C, shading def _pcolor_grid_deprecation_helper(self): - if any(axis._major_tick_kw["gridOn"] - for axis in self._get_axis_list()): + grid_active = any(axis._major_tick_kw["gridOn"] + for axis in self._get_axis_list()) + # explicit is-True check because get_axisbelow() can also be 'line' + grid_hidden_by_pcolor = self.get_axisbelow() is True + if grid_active and not grid_hidden_by_pcolor: _api.warn_deprecated( "3.5", message="Auto-removal of grids by pcolor() and " "pcolormesh() is deprecated since %(since)s and will be "