Merge pull request #14574 from meeseeksmachine/auto-backport-of-pr-14568-on-v3.1.x

timhoffm · web-flow · commit 275abe664130 · 2019-06-19T09:29:36.000+02:00
Backport PR #14568 on branch v3.1.x (Don't assume tk canvas have a manager attached.)
diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
@@ -587,8 +587,8 @@ class NavigationToolbar2Tk(NavigationToolbar2, tk.Frame):
     """
     def __init__(self, canvas, window):
         self.canvas = canvas
-        # Avoid using self.window (prefer self.canvas.manager.window), so that
-        # Tool implementations can reuse the methods.
+        # Avoid using self.window (prefer self.canvas.get_tk_widget().master),
+        # so that Tool implementations can reuse the methods.
         self.window = window
         NavigationToolbar2.__init__(self, canvas)
 
@@ -613,7 +613,7 @@ def release(self, event):
             del self.lastrect
 
     def set_cursor(self, cursor):
-        window = self.canvas.manager.window
+        window = self.canvas.get_tk_widget().master
         window.configure(cursor=cursord[cursor])
         window.update_idletasks()
 
@@ -688,7 +688,7 @@ def save_figure(self, *args):
         initialdir = os.path.expanduser(rcParams['savefig.directory'])
         initialfile = self.canvas.get_default_filename()
         fname = tkinter.filedialog.asksaveasfilename(
-            master=self.canvas.manager.window,
+            master=self.canvas.get_tk_widget().master,
             title='Save the figure',
             filetypes=tk_filetypes,
             defaultextension=defaultextension,
