Merge pull request #25316 from anntzer/sc

rcomer · web-flow · commit ce54a4f09247 · 2023-02-24T19:02:55.000Z
Use setattr_cm more.
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -2766,12 +2766,8 @@ def savefig(self, figure=None, **kwargs):
                 raise ValueError(f"No figure {figure}")
             figure = manager.canvas.figure
         # Force use of pdf backend, as PdfPages is tightly coupled with it.
-        try:
-            orig_canvas = figure.canvas
-            figure.canvas = FigureCanvasPdf(figure)
+        with cbook._setattr_cm(figure, canvas=FigureCanvasPdf(figure)):
             figure.savefig(self, format="pdf", **kwargs)
-        finally:
-            figure.canvas = orig_canvas
 
     def get_pagecount(self):
         """Return the current number of pages in the multipage pdf file."""
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -1017,10 +1017,7 @@ def savefig(self, figure=None, **kwargs):
                 raise ValueError(f"No figure {figure}")
             figure = manager.canvas.figure
 
-        try:
-            orig_canvas = figure.canvas
-            figure.canvas = FigureCanvasPgf(figure)
-
+        with cbook._setattr_cm(figure, canvas=FigureCanvasPgf(figure)):
             width, height = figure.get_size_inches()
             if self._n_figures == 0:
                 self._write_header(width, height)
@@ -1036,11 +1033,8 @@ def savefig(self, figure=None, **kwargs):
                     br'\else\pageheight\fi=%ain'
                     b'%%\n' % (width, height)
                 )
-
             figure.savefig(self._file, format="pgf", **kwargs)
             self._n_figures += 1
-        finally:
-            figure.canvas = orig_canvas
 
     def get_pagecount(self):
         """Return the current number of pages in the multipage pdf file."""
