Merge pull request #20348 from anntzer/tiow

timhoffm · web-flow · commit d0ad9b06a9dd · 2021-06-10T02:03:18.000+02:00
codecs.getwriter has simpler lifetime semantics than TextIOWrapper.
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -2,10 +2,11 @@
 A PostScript backend, which can produce both PostScript .ps and .eps.
 """
 
+import codecs
 import datetime
 from enum import Enum
 import glob
-from io import StringIO, TextIOWrapper
+from io import StringIO
 import logging
 import math
 import os
@@ -865,12 +866,8 @@ def _print_figure(
         generated from the *metadata* parameter to `.print_figure`.
         """
         is_eps = format == 'eps'
-        if isinstance(outfile, (str, os.PathLike)):
-            outfile = os.fspath(outfile)
-            passed_in_file_object = False
-        elif is_writable_file_like(outfile):
-            passed_in_file_object = True
-        else:
+        if not (isinstance(outfile, (str, os.PathLike))
+                or is_writable_file_like(outfile)):
             raise ValueError("outfile must be a path or a file-like object")
 
         # find the appropriate papertype
@@ -997,23 +994,11 @@ def print_figure_impl(fh):
                                  tmpfile, is_eps, ptype=papertype, bbox=bbox)
                 _move_path_to_path_or_stream(tmpfile, outfile)
 
-        else:
-            # Write directly to outfile.
-            if passed_in_file_object:
-                requires_unicode = file_requires_unicode(outfile)
-
-                if not requires_unicode:
-                    fh = TextIOWrapper(outfile, encoding="latin-1")
-                    # Prevent the TextIOWrapper from closing the underlying
-                    # file.
-                    fh.close = lambda: None
-                else:
-                    fh = outfile
-
-                print_figure_impl(fh)
-            else:
-                with open(outfile, 'w', encoding='latin-1') as fh:
-                    print_figure_impl(fh)
+        else:  # Write directly to outfile.
+            with cbook.open_file_cm(outfile, "w", encoding="latin-1") as file:
+                if not file_requires_unicode(file):
+                    file = codecs.getwriter("latin-1")(file)
+                print_figure_impl(file)
 
     @_check_savefig_extra_args
     def _print_figure_tex(
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -1,8 +1,9 @@
 import base64
+import codecs
 import datetime
 import gzip
 import hashlib
-from io import BytesIO, StringIO, TextIOWrapper
+from io import BytesIO, StringIO
 import itertools
 import logging
 import os
@@ -1310,24 +1311,13 @@ def print_svg(self, filename, *args, **kwargs):
             __ DC_
         """
         with cbook.open_file_cm(filename, "w", encoding="utf-8") as fh:
-
             filename = getattr(fh, 'name', '')
             if not isinstance(filename, str):
                 filename = ''
-
-            if cbook.file_requires_unicode(fh):
-                detach = False
-            else:
-                fh = TextIOWrapper(fh, 'utf-8')
-                detach = True
-
+            if not cbook.file_requires_unicode(fh):
+                fh = codecs.getwriter('utf-8')(fh)
             self._print_svg(filename, fh, **kwargs)
 
-            # Detach underlying stream from wrapper so that it remains open in
-            # the caller.
-            if detach:
-                fh.detach()
-
     @_api.delete_parameter("3.5", "args")
     def print_svgz(self, filename, *args, **kwargs):
         with cbook.open_file_cm(filename, "wb") as fh, \
diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
@@ -68,6 +68,8 @@ def test_savefig_to_stringio(format, use_log, rcParams, orientation):
         except tuple(allowable_exceptions) as exc:
             pytest.skip(str(exc))
 
+        assert not s_buf.closed
+        assert not b_buf.closed
         s_val = s_buf.getvalue().encode('ascii')
         b_val = b_buf.getvalue()
 
