Merge pull request #7833 from anntzer/deprecate-xmllint-verification

NelleV · web-flow · commit 6f61b26a8614 · 2017-01-15T11:03:06.000-08:00
Deprecate unused verification code.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -120,6 +120,7 @@
 import functools
 # cbook must import matplotlib only within function
 # definitions, so it is safe to import from it here.
+from . import cbook
 from matplotlib.cbook import (is_string_like,
                               mplDeprecation,
                               dedent, get_label,
@@ -438,6 +439,7 @@ def checkdep_inkscape():
 checkdep_inkscape.version = None
 
 
+@cbook.deprecated("2.1")
 def checkdep_xmllint():
     try:
         s = subprocess.Popen(['xmllint', '--version'], stdout=subprocess.PIPE,
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -216,6 +216,7 @@ def convert(filename, cache):
         'xmllint', '--valid', '--nowarning', '--noout', filename]
 
 
+@cbook.deprecated("2.1")
 def verify(filename):
     """Verify the file through some sort of verification tool."""
     if not os.path.exists(filename):
@@ -292,14 +293,10 @@ def compare_images(expected, actual, tol, in_decorator=False):
 
     """
     if not os.path.exists(actual):
-        msg = "Output image %s does not exist." % actual
-        raise Exception(msg)
+        raise Exception("Output image %s does not exist." % actual)
 
     if os.stat(actual).st_size == 0:
-        msg = "Output image file %s is empty." % actual
-        raise Exception(msg)
-
-    verify(actual)
+        raise Exception("Output image file %s is empty." % actual)
 
     # Convert the image to png
     extension = expected.split('.')[-1]
