Inline _print_svg into its only call site (print_svg).

anntzer · anntzer · commit 36f0926a67a2 · 2021-07-08T08:40:20.000+02:00
Splitting the implementation in two parts doesn't buy us anything, and
merging them makes it easier to have an explicit signature on print_svg.
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -1282,8 +1282,11 @@ class FigureCanvasSVG(FigureCanvasBase):
 
     fixed_dpi = 72
 
+    @_check_savefig_extra_args
+    @_api.delete_parameter("3.4", "dpi")
     @_api.delete_parameter("3.5", "args")
-    def print_svg(self, filename, *args, **kwargs):
+    def print_svg(self, filename, *args, dpi=None, bbox_inches_restore=None,
+                  metadata=None):
         """
         Parameters
         ----------
@@ -1318,32 +1321,24 @@ def print_svg(self, filename, *args, **kwargs):
         with cbook.open_file_cm(filename, "w", encoding="utf-8") as fh:
             if not cbook.file_requires_unicode(fh):
                 fh = codecs.getwriter('utf-8')(fh)
-            self._print_svg(filename, fh, **kwargs)
+            if dpi is None:  # always use this branch after deprecation elapses
+                dpi = self.figure.get_dpi()
+            self.figure.set_dpi(72)
+            width, height = self.figure.get_size_inches()
+            w, h = width * 72, height * 72
+            renderer = MixedModeRenderer(
+                self.figure, width, height, dpi,
+                RendererSVG(w, h, fh, image_dpi=dpi, metadata=metadata),
+                bbox_inches_restore=bbox_inches_restore)
+            self.figure.draw(renderer)
+            renderer.finalize()
 
     @_api.delete_parameter("3.5", "args")
     def print_svgz(self, filename, *args, **kwargs):
         with cbook.open_file_cm(filename, "wb") as fh, \
                 gzip.GzipFile(mode='w', fileobj=fh) as gzipwriter:
             return self.print_svg(gzipwriter, **kwargs)
 
-    @_check_savefig_extra_args
-    @_api.delete_parameter("3.4", "dpi")
-    def _print_svg(self, filename, fh, *, dpi=None, bbox_inches_restore=None,
-                   metadata=None):
-        if dpi is None:  # always use this branch after deprecation elapses.
-            dpi = self.figure.get_dpi()
-        self.figure.set_dpi(72)
-        width, height = self.figure.get_size_inches()
-        w, h = width * 72, height * 72
-
-        renderer = MixedModeRenderer(
-            self.figure, width, height, dpi,
-            RendererSVG(w, h, fh, image_dpi=dpi, metadata=metadata),
-            bbox_inches_restore=bbox_inches_restore)
-
-        self.figure.draw(renderer)
-        renderer.finalize()
-
     def get_default_filetype(self):
         return 'svg'
 
