Move checkdep_ps_distiller to the rc validators.

anntzer · anntzer · commit c1d8bbbf4fe9 · 2018-02-23T13:39:35.000-08:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -541,6 +541,7 @@ def checkdep_inkscape():
 checkdep_inkscape.version = None
 
 
+@cbook.deprecated("2.2")
 def checkdep_ps_distiller(s):
     if not s:
         return False
@@ -550,7 +551,7 @@ def checkdep_ps_distiller(s):
         return False
     if s == "xpdf" and not get_executable_info("pdftops"):
         warnings.warn(
-            "setting matplotlibrc ps.usedistiller to 'xpdf' requires xpdf.")
+            "Setting matplotlibrc ps.usedistiller to 'xpdf' requires xpdf.")
         return False
     return s
 
@@ -1166,9 +1167,6 @@ def rc_params_from_file(fname, fail_on_error=False, use_default_template=True):
                                 six.iteritems(defaultParams)
                                 if key not in _all_deprecated])
 
-rcParams['ps.usedistiller'] = checkdep_ps_distiller(
-                      rcParams['ps.usedistiller'])
-
 rcParams['text.usetex'] = checkdep_usetex(rcParams['text.usetex'])
 
 if rcParams['axes.formatter.use_locale']:
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -21,7 +21,7 @@
     _Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
     RendererBase)
 from matplotlib.backends.backend_mixed import MixedModeRenderer
-from matplotlib.cbook import _backports, is_writable_file_like
+from matplotlib.cbook import is_writable_file_like
 from matplotlib.compat import subprocess
 from matplotlib.compat.subprocess import check_output
 from matplotlib.path import Path
@@ -167,20 +167,20 @@ def _font_properties_str(prop):
 
 def make_pdf_to_png_converter():
     """Returns a function that converts a pdf file to a png file."""
-    if _backports.which("pdftocairo"):
+    if shutil.which("pdftocairo"):
         def cairo_convert(pdffile, pngfile, dpi):
-            cmd = [str("pdftocairo"), "-singlefile", "-png", "-r", "%d" % dpi,
+            cmd = ["pdftocairo", "-singlefile", "-png", "-r", "%d" % dpi,
                    pdffile, os.path.splitext(pngfile)[0]]
             check_output(cmd, stderr=subprocess.STDOUT)
         return cairo_convert
     if mpl.get_executable_info("gs"):
         def gs_convert(pdffile, pngfile, dpi):
-            cmd = [str(gs),
-                   '-dQUIET', '-dSAFER', '-dBATCH', '-dNOPAUSE', '-dNOPROMPT',
-                   '-dUseCIEColor', '-dTextAlphaBits=4',
-                   '-dGraphicsAlphaBits=4', '-dDOINTERPOLATE',
-                   '-sDEVICE=png16m', '-sOutputFile=%s' % pngfile,
-                   '-r%d' % dpi, pdffile]
+            cmd = ["gs",
+                   "-dQUIET", "-dSAFER", "-dBATCH", "-dNOPAUSE", "-dNOPROMPT",
+                   "-dUseCIEColor", "-dTextAlphaBits=4",
+                   "-dGraphicsAlphaBits=4", "-dDOINTERPOLATE",
+                   "-sDEVICE=png16m", "-sOutputFile=%s" % pngfile,
+                   "-r%d" % dpi, pdffile]
             check_output(cmd, stderr=subprocess.STDOUT)
         return gs_convert
     raise RuntimeError("No suitable pdf to png renderer found")
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -13,7 +13,6 @@
 parameter set listed here should also be visited to the
 :file:`matplotlibrc.template` in matplotlib's root source directory.
 """
-from __future__ import absolute_import, division, print_function
 
 import six
 
@@ -24,7 +23,8 @@
 import warnings
 import re
 
-from matplotlib import cbook, testing
+import matplotlib as mpl
+from matplotlib import cbook
 from matplotlib.cbook import mplDeprecation, deprecated, ls_mapper
 from matplotlib.fontconfig_pattern import parse_fontconfig_pattern
 from matplotlib.colors import is_color_like
@@ -514,7 +514,12 @@ def validate_ps_distiller(s):
     elif s in ('false', False):
         return False
     elif s in ('ghostscript', 'xpdf'):
-        return s
+        if not mpl.get_executable_info("gs"):
+            warnings.warn("Setting ps.usedistiller requires ghostscript.")
+            return False
+        if s == "xpdf" and not mpl.get_executable_info("pdftops"):
+            warnings.warn("Setting ps.usedistiller to 'xpdf' requires xpdf.")
+            return False
     else:
         raise ValueError('matplotlibrc ps.usedistiller must either be none, '
                          'ghostscript or xpdf')
