Use parentheses for multi-line context expressions

Now allowed in Python 3.10.

Author: QuLogic

lib/matplotlib/animation.py

@@ -1086,8 +1086,8 @@ def _pre_composite_to_white(color):
         # canvas._is_saving = True makes the draw_event animation-starting
         # callback a no-op; canvas.manager = None prevents resizing the GUI
         # widget (both are likewise done in savefig()).
-        with writer.saving(self._fig, filename, dpi), \
-             cbook._setattr_cm(self._fig.canvas, _is_saving=True, manager=None):
+        with (writer.saving(self._fig, filename, dpi),
+              cbook._setattr_cm(self._fig.canvas, _is_saving=True, manager=None)):
             for anim in all_anim:
                 anim._init_draw()  # Clear the initial frame
             frame_number = 0

lib/matplotlib/backend_bases.py

@@ -1972,8 +1972,8 @@ def _switch_canvas_and_return_print_method(self, fmt, backend=None):
         """
         Context manager temporarily setting the canvas for saving the figure::
 
-            with canvas._switch_canvas_and_return_print_method(fmt, backend) \\
-                    as print_method:
+            with (canvas._switch_canvas_and_return_print_method(fmt, backend)
+                  as print_method):
                 # ``print_method`` is a suitable ``print_{fmt}`` method, and
                 # the figure's canvas is temporarily switched to the method's
                 # canvas within the with... block.  ``print_method`` is also
@@ -2110,13 +2110,13 @@ def print_figure(
                 "'figure', or omit the *papertype* argument entirely.")
 
         # Remove the figure manager, if any, to avoid resizing the GUI widget.
-        with cbook._setattr_cm(self, manager=None), \
-             self._switch_canvas_and_return_print_method(format, backend) \
-                 as print_method, \
-             cbook._setattr_cm(self.figure, dpi=dpi), \
-             cbook._setattr_cm(self.figure.canvas, _device_pixel_ratio=1), \
-             cbook._setattr_cm(self.figure.canvas, _is_saving=True), \
-             ExitStack() as stack:
+        with (cbook._setattr_cm(self, manager=None),
+              self._switch_canvas_and_return_print_method(format, backend)
+                 as print_method,
+              cbook._setattr_cm(self.figure, dpi=dpi),
+              cbook._setattr_cm(self.figure.canvas, _device_pixel_ratio=1),
+              cbook._setattr_cm(self.figure.canvas, _is_saving=True),
+              ExitStack() as stack):
 
             for prop in ["facecolor", "edgecolor"]:
                 color = locals()[prop]

lib/matplotlib/backend_tools.py

@@ -382,8 +382,8 @@ def trigger(self, sender, event, data=None):
         sentinel = str(uuid.uuid4())
         # Trigger grid switching by temporarily setting :rc:`keymap.grid`
         # to a unique key and sending an appropriate event.
-        with cbook._setattr_cm(event, key=sentinel), \
-             mpl.rc_context({'keymap.grid': sentinel}):
+        with (cbook._setattr_cm(event, key=sentinel),
+              mpl.rc_context({'keymap.grid': sentinel})):
             mpl.backend_bases.key_press_handler(event, self.figure.canvas)
 
 
@@ -397,8 +397,8 @@ def trigger(self, sender, event, data=None):
         sentinel = str(uuid.uuid4())
         # Trigger grid switching by temporarily setting :rc:`keymap.grid_minor`
         # to a unique key and sending an appropriate event.
-        with cbook._setattr_cm(event, key=sentinel), \
-             mpl.rc_context({'keymap.grid_minor': sentinel}):
+        with (cbook._setattr_cm(event, key=sentinel),
+              mpl.rc_context({'keymap.grid_minor': sentinel})):
             mpl.backend_bases.key_press_handler(event, self.figure.canvas)
 
 

lib/matplotlib/backends/backend_pgf.py

@@ -849,8 +849,8 @@ def print_pdf(self, fname_or_fh, *, metadata=None, **kwargs):
             cbook._check_and_log_subprocess(
                 [texcommand, "-interaction=nonstopmode", "-halt-on-error",
                  "figure.tex"], _log, cwd=tmpdir)
-            with (tmppath / "figure.pdf").open("rb") as orig, \
-                 cbook.open_file_cm(fname_or_fh, "wb") as dest:
+            with ((tmppath / "figure.pdf").open("rb") as orig,
+                  cbook.open_file_cm(fname_or_fh, "wb") as dest):
                 shutil.copyfileobj(orig, dest)  # copy file contents to target
 
     def print_png(self, fname_or_fh, **kwargs):
@@ -862,8 +862,8 @@ def print_png(self, fname_or_fh, **kwargs):
             png_path = tmppath / "figure.png"
             self.print_pdf(pdf_path, **kwargs)
             converter(pdf_path, png_path, dpi=self.figure.dpi)
-            with png_path.open("rb") as orig, \
-                 cbook.open_file_cm(fname_or_fh, "wb") as dest:
+            with (png_path.open("rb") as orig,
+                  cbook.open_file_cm(fname_or_fh, "wb") as dest):
                 shutil.copyfileobj(orig, dest)  # copy file contents to target
 
     def get_renderer(self):

lib/matplotlib/backends/backend_svg.py

@@ -1347,8 +1347,8 @@ def print_svg(self, filename, *, bbox_inches_restore=None, metadata=None):
             renderer.finalize()
 
     def print_svgz(self, filename, **kwargs):
-        with cbook.open_file_cm(filename, "wb") as fh, \
-                gzip.GzipFile(mode='w', fileobj=fh) as gzipwriter:
+        with (cbook.open_file_cm(filename, "wb") as fh,
+              gzip.GzipFile(mode='w', fileobj=fh) as gzipwriter):
             return self.print_svg(gzipwriter, **kwargs)
 
     def get_default_filetype(self):

lib/matplotlib/colorbar.py

@@ -1115,10 +1115,8 @@ def _mesh(self):
             # Update the norm values in a context manager as it is only
             # a temporary change and we don't want to propagate any signals
             # attached to the norm (callbacks.blocked).
-            with self.norm.callbacks.blocked(), \
-                    cbook._setattr_cm(self.norm,
-                                      vmin=self.vmin,
-                                      vmax=self.vmax):
+            with (self.norm.callbacks.blocked(),
+                  cbook._setattr_cm(self.norm, vmin=self.vmin, vmax=self.vmax)):
                 y = self.norm.inverse(y)
         self._y = y
         X, Y = np.meshgrid([0., 1.], y)

lib/matplotlib/tests/test_backend_pdf.py

@@ -91,8 +91,8 @@ def test_multipage_keep_empty(tmp_path):
 
     # an empty pdf is left behind with keep_empty=True
     fn = tmp_path / "b.pdf"
-    with pytest.warns(mpl.MatplotlibDeprecationWarning), \
-            PdfPages(fn, keep_empty=True) as pdf:
+    with (pytest.warns(mpl.MatplotlibDeprecationWarning),
+          PdfPages(fn, keep_empty=True) as pdf):
         pass
     assert fn.exists()
 
@@ -112,8 +112,8 @@ def test_multipage_keep_empty(tmp_path):
 
     # a non-empty pdf is left behind with keep_empty=True
     fn = tmp_path / "e.pdf"
-    with pytest.warns(mpl.MatplotlibDeprecationWarning), \
-            PdfPages(fn, keep_empty=True) as pdf:
+    with (pytest.warns(mpl.MatplotlibDeprecationWarning),
+          PdfPages(fn, keep_empty=True) as pdf):
         pdf.savefig(plt.figure())
     assert fn.exists()
 

lib/matplotlib/tests/test_backend_pgf.py

@@ -298,8 +298,8 @@ def test_multipage_keep_empty(tmp_path):
 
     # an empty pdf is left behind with keep_empty=True
     fn = tmp_path / "b.pdf"
-    with pytest.warns(mpl.MatplotlibDeprecationWarning), \
-            PdfPages(fn, keep_empty=True) as pdf:
+    with (pytest.warns(mpl.MatplotlibDeprecationWarning),
+          PdfPages(fn, keep_empty=True) as pdf):
         pass
     assert fn.exists()
 
@@ -319,8 +319,8 @@ def test_multipage_keep_empty(tmp_path):
 
     # a non-empty pdf is left behind with keep_empty=True
     fn = tmp_path / "e.pdf"
-    with pytest.warns(mpl.MatplotlibDeprecationWarning), \
-            PdfPages(fn, keep_empty=True) as pdf:
+    with (pytest.warns(mpl.MatplotlibDeprecationWarning),
+          PdfPages(fn, keep_empty=True) as pdf):
         pdf.savefig(plt.figure())
     assert fn.exists()
 

lib/matplotlib/tests/test_cbook.py

@@ -466,8 +466,7 @@ def test_sanitize_sequence():
 
 @pytest.mark.parametrize('inp, kwargs_to_norm', fail_mapping)
 def test_normalize_kwargs_fail(inp, kwargs_to_norm):
-    with pytest.raises(TypeError), \
-         _api.suppress_matplotlib_deprecation_warning():
+    with pytest.raises(TypeError), _api.suppress_matplotlib_deprecation_warning():
         cbook.normalize_kwargs(inp, **kwargs_to_norm)