Merge pull request #12882 from timhoffm/log-instead-of-stderr

jklymak · web-flow · commit 4cab2ecf3487 · 2018-11-26T14:17:34.000-08:00
Write error messages to logger instead of stderr
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
@@ -38,13 +38,17 @@
 """
 
 from collections import namedtuple
+import logging
 import re
-import sys
+
 
 from ._mathtext_data import uni2type1
 from matplotlib.cbook import deprecated
 
 
+_log = logging.getLogger(__name__)
+
+
 # some afm files have floats where we are expecting ints -- there is
 # probably a better way to handle this (support floats, round rather
 # than truncate).  But I don't know what the best approach is now and
@@ -160,12 +164,10 @@ def _parse_header(fh):
         try:
             d[key] = headerConverters[key](val)
         except ValueError:
-            print('Value error parsing header in AFM:', key, val,
-                  file=sys.stderr)
+            _log.error('Value error parsing header in AFM: %s, %s', key, val)
             continue
         except KeyError:
-            print('Found an unknown keyword in AFM header (was %r)' % key,
-                  file=sys.stderr)
+            _log.error('Found an unknown keyword in AFM header (was %r)' % key)
             continue
         if key == b'StartCharMetrics':
             return d
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -1520,23 +1520,16 @@ def writeObject(self, object, contents):
 
     def writeXref(self):
         """Write out the xref table."""
-
         self.startxref = self.fh.tell() - self.tell_base
         self.write(b"xref\n0 %d\n" % self.nextObject)
-        i = 0
-        borken = False
-        for offset, generation, name in self.xrefTable:
+        for i, (offset, generation, name) in enumerate(self.xrefTable):
             if offset is None:
-                print('No offset for object %d (%s)' % (i, name),
-                      file=sys.stderr)
-                borken = True
+                raise AssertionError(
+                    'No offset for object %d (%s)' % (i, name))
             else:
                 key = b"f" if name == 'the zero object' else b"n"
                 text = b"%010d %05d %b \n" % (offset, generation, key)
                 self.write(text)
-            i += 1
-        if borken:
-            raise AssertionError('Indirect object does not exist')
 
     def writeInfoDict(self):
         """Write out the info dictionary, checking it for good form"""
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -756,10 +756,10 @@ def add(tmpdir):
     @staticmethod
     def cleanup_remaining_tmpdirs():
         for tmpdir in TmpDirCleaner.remaining_tmpdirs:
+            error_message = "error deleting tmp directory {}".format(tmpdir)
             shutil.rmtree(
                 tmpdir,
-                onerror=lambda *args: print("error deleting tmp directory %s"
-                                            % tmpdir, file=sys.stderr))
+                onerror=lambda *args: _log.error(error_message))
 
 
 class FigureCanvasPgf(FigureCanvasBase):
