From d8ff5292cba9ce8cecba31367f00b082722429a4 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 10 Feb 2023 18:58:59 +0000 Subject: [PATCH] Expire wx canvas param deprecation --- doc/api/next_api_changes/behavior/25192-DS.rst | 4 ++++ lib/matplotlib/backends/backend_wx.py | 13 ++----------- 2 files changed, 6 insertions(+), 11 deletions(-) create mode 100644 doc/api/next_api_changes/behavior/25192-DS.rst diff --git a/doc/api/next_api_changes/behavior/25192-DS.rst b/doc/api/next_api_changes/behavior/25192-DS.rst new file mode 100644 index 000000000000..5f15a3da02df --- /dev/null +++ b/doc/api/next_api_changes/behavior/25192-DS.rst @@ -0,0 +1,4 @@ +``canvas`` argument now required for ``FigureFrameWx`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +``FigureFrameWx`` now requires a keyword-only ``canvas`` argument +when it is constructed. diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py index d4eef8e22705..afd92cce008d 100644 --- a/lib/matplotlib/backends/backend_wx.py +++ b/lib/matplotlib/backends/backend_wx.py @@ -902,7 +902,7 @@ def _print_image(self, filetype, filename): class FigureFrameWx(wx.Frame): - def __init__(self, num, fig, *, canvas_class=None): + def __init__(self, num, fig, *, canvas_class): # On non-Windows platform, explicitly set the position - fix # positioning bug on some Linux platforms if wx.Platform == '__WXMSW__': @@ -914,16 +914,7 @@ def __init__(self, num, fig, *, canvas_class=None): _log.debug("%s - __init__()", type(self)) _set_frame_icon(self) - # The parameter will become required after the deprecation elapses. - if canvas_class is not None: - self.canvas = canvas_class(self, -1, fig) - else: - _api.warn_deprecated( - "3.6", message="The canvas_class parameter will become " - "required after the deprecation period starting in Matplotlib " - "%(since)s elapses.") - self.canvas = self.get_canvas(fig) - + self.canvas = canvas_class(self, -1, fig) # Auto-attaches itself to self.canvas.manager manager = FigureManagerWx(self.canvas, num, self)