Merge pull request #25246 from meeseeksmachine/auto-backport-of-pr-25240-on-v3.7.x

rcomer · web-flow · commit e4e4709e914c · 2023-02-18T19:03:41.000Z
Backport PR #25240 on branch v3.7.x (Avoid calling vars() on arbitrary third-party manager_class.)
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -898,7 +898,7 @@ def _tight_layout(self):
         self._figure.tight_layout()
         for attr, spinbox in self._spinboxes.items():
             spinbox.blockSignals(True)
-            spinbox.setValue(vars(self._figure.subplotpars)[attr])
+            spinbox.setValue(getattr(self._figure.subplotpars, attr))
             spinbox.blockSignals(False)
         self._figure.canvas.draw_idle()
 
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -325,11 +325,12 @@ def draw_if_interactive():
     # show is already present, as the latter may be here for backcompat.
     manager_class = getattr(getattr(backend_mod, "FigureCanvas", None),
                             "manager_class", None)
-    # We can't compare directly manager_class.pyplot_show and FMB.pyplot_show
-    # because pyplot_show is a classmethod so the above constructs are bound
-    # classmethods, & thus always different (being bound to different classes).
-    manager_pyplot_show = vars(manager_class).get("pyplot_show")
-    base_pyplot_show = vars(FigureManagerBase).get("pyplot_show")
+    # We can't compare directly manager_class.pyplot_show and FMB.pyplot_show because
+    # pyplot_show is a classmethod so the above constructs are bound classmethods, and
+    # thus always different (being bound to different classes).  We also have to use
+    # getattr_static instead of vars as manager_class could have no __dict__.
+    manager_pyplot_show = inspect.getattr_static(manager_class, "pyplot_show", None)
+    base_pyplot_show = inspect.getattr_static(FigureManagerBase, "pyplot_show", None)
     if (show is None
             or (manager_pyplot_show is not None
                 and manager_pyplot_show != base_pyplot_show)):
