Merge pull request #21560 from meeseeksmachine/auto-backport-of-pr-21553-on-v3.5.x

jklymak · web-flow · commit b41f8f47b27b · 2021-11-08T08:59:20.000+01:00
Backport PR #21553 on branch v3.5.x (Fix check for manager presence in blocking_input.)
diff --git a/lib/matplotlib/_blocking_input.py b/lib/matplotlib/_blocking_input.py
@@ -18,7 +18,7 @@ def blocking_input_loop(figure, event_names, timeout, handler):
         Function called for each event; it can force an early exit of the event
         loop by calling ``canvas.stop_event_loop()``.
     """
-    if hasattr(figure.canvas, "manager"):
+    if figure.canvas.manager:
         figure.show()  # Ensure that the figure is shown if we are managing it.
     # Connect the events to the on_event function call.
     cids = [figure.canvas.mpl_connect(name, handler) for name in event_names]
diff --git a/lib/matplotlib/blocking_input.py b/lib/matplotlib/blocking_input.py
@@ -83,7 +83,7 @@ def __call__(self, n=1, timeout=30):
         self.n = n
         self.events = []
 
-        if hasattr(self.fig.canvas, "manager"):
+        if self.figure.canvas.manager:
             # Ensure that the figure is shown, if we are managing it.
             self.fig.show()
         # Connect the events to the on_event function call.
