From 536582f2df4dcb93ca095fe4cd2717ad1621c59d Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Thu, 12 Oct 2023 15:05:15 -0700 Subject: [PATCH] MNT: revert contour deprecations --- doc/api/next_api_changes/deprecations/27075-JK.rst | 5 +++++ lib/matplotlib/contour.py | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 doc/api/next_api_changes/deprecations/27075-JK.rst diff --git a/doc/api/next_api_changes/deprecations/27075-JK.rst b/doc/api/next_api_changes/deprecations/27075-JK.rst new file mode 100644 index 000000000000..ea7fef5abf64 --- /dev/null +++ b/doc/api/next_api_changes/deprecations/27075-JK.rst @@ -0,0 +1,5 @@ +Deprecations removed in ``contour`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +``contour.allsegs``, ``contour.allkinds``, and ``contour.find_nearest_contour`` are no +longer marked for deprecation. diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py index dc5ed5d626bc..042cc91225c9 100644 --- a/lib/matplotlib/contour.py +++ b/lib/matplotlib/contour.py @@ -929,12 +929,12 @@ def __init__(self, ax, *args, ", ".join(map(repr, kwargs)) ) - allsegs = _api.deprecated("3.8", pending=True)(property(lambda self: [ + allsegs = property(lambda self: [ [subp.vertices for subp in p._iter_connected_components()] - for p in self.get_paths()])) - allkinds = _api.deprecated("3.8", pending=True)(property(lambda self: [ + for p in self.get_paths()]) + allkinds = property(lambda self: [ [subp.codes for subp in p._iter_connected_components()] - for p in self.get_paths()])) + for p in self.get_paths()]) tcolors = _api.deprecated("3.8")(property(lambda self: [ (tuple(rgba),) for rgba in self.to_rgba(self.cvalues, self.alpha)])) tlinewidths = _api.deprecated("3.8")(property(lambda self: [ @@ -1388,7 +1388,6 @@ def _find_nearest_contour(self, xy, indices=None): return idx_level_min, idx_vtx_min, proj_min - @_api.deprecated("3.8") def find_nearest_contour(self, x, y, indices=None, pixel=True): """ Find the point in the contour plot that is closest to ``(x, y)``.