default zorder for clabel changed to (2+zorder of contour/contourf)

pharshalp · pharshalp · commit 0af446b67706 · 2020-01-27T11:03:38.000-05:00
diff --git a/doc/users/next_whats_new/2020-01-25-clabel_zorder.rst b/doc/users/next_whats_new/2020-01-25-clabel_zorder.rst
@@ -1,4 +1,9 @@
 Set zorder of contour labels
 ----------------------------
 `~.axes.Axes.clabel` now accepts a ``zorder`` kwarg
-making it easier to set the ``zorder`` of contour labels.
+making it easier to set the ``zorder`` of contour labels.
+If not specified, the default ``zorder`` of clabels used to always be 3
+(i.e. the default ``zorder`` of `~.text.Text`) irrespective of the ``zorder``
+passed to `~.axes.Axes.contour`/`~.axes.Axes.contourf`.
+The new default ``zorder`` for clabels has been changed to (2 + ``zorder``
+passed to `~.axes.Axes.contour`/`~.axes.Axes.contourf`).
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -127,9 +127,8 @@ def clabel(self, levels=None, *,
         zorder : float or None, optional
             zorder of the contour labels.
 
-            If not specified, the zorder of contour labels is set to either
-            (2 + zorder of contours) or (1 + zorder of contours) depending on
-            whether the contours are filled or not filled.
+            If not specified, the zorder of contour labels is set to
+            (2 + zorder of contours).
 
         Returns
         -------
@@ -152,10 +151,7 @@ def clabel(self, levels=None, *,
         self.labelManual = manual
         self.rightside_up = rightside_up
         if zorder is None:
-            if self.filled:
-                self._clabel_zorder = 2+self._contour_zorder
-            else:
-                self._clabel_zorder = 1+self._contour_zorder
+            self._clabel_zorder = 2+self._contour_zorder
         else:
             self._clabel_zorder = zorder
 
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
@@ -305,16 +305,14 @@ def test_clabel_zorder(use_clabeltext, contour_zorder, clabel_zorder):
                                 use_clabeltext=use_clabeltext)
 
     if clabel_zorder is None:
-        expected_clabel_zorder = 1+contour_zorder
-        expected_filled_clabel_zorder = 2+contour_zorder
+        expected_clabel_zorder = 2+contour_zorder
     else:
         expected_clabel_zorder = clabel_zorder
-        expected_filled_clabel_zorder = clabel_zorder
 
     for clabel in clabels1:
         assert clabel.get_zorder() == expected_clabel_zorder
     for clabel in clabels2:
-        assert clabel.get_zorder() == expected_filled_clabel_zorder
+        assert clabel.get_zorder() == expected_clabel_zorder
 
 
 @image_comparison(['contour_log_extension.png'],
