Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 238e275

Browse filesBrowse files
authored
Merge pull request #25192 from dstansby/wx-canvas
Expire wx canvas param deprecation
2 parents 38bbf7e + d8ff529 commit 238e275
Copy full SHA for 238e275

File tree

Expand file treeCollapse file tree

2 files changed

+6
-11
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+6
-11
lines changed
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
``canvas`` argument now required for ``FigureFrameWx``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
``FigureFrameWx`` now requires a keyword-only ``canvas`` argument
4+
when it is constructed.

‎lib/matplotlib/backends/backend_wx.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_wx.py
+2-11Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ def _print_image(self, filetype, filename):
902902

903903

904904
class FigureFrameWx(wx.Frame):
905-
def __init__(self, num, fig, *, canvas_class=None):
905+
def __init__(self, num, fig, *, canvas_class):
906906
# On non-Windows platform, explicitly set the position - fix
907907
# positioning bug on some Linux platforms
908908
if wx.Platform == '__WXMSW__':
@@ -914,16 +914,7 @@ def __init__(self, num, fig, *, canvas_class=None):
914914
_log.debug("%s - __init__()", type(self))
915915
_set_frame_icon(self)
916916

917-
# The parameter will become required after the deprecation elapses.
918-
if canvas_class is not None:
919-
self.canvas = canvas_class(self, -1, fig)
920-
else:
921-
_api.warn_deprecated(
922-
"3.6", message="The canvas_class parameter will become "
923-
"required after the deprecation period starting in Matplotlib "
924-
"%(since)s elapses.")
925-
self.canvas = self.get_canvas(fig)
926-
917+
self.canvas = canvas_class(self, -1, fig)
927918
# Auto-attaches itself to self.canvas.manager
928919
manager = FigureManagerWx(self.canvas, num, self)
929920

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.