Remove two more deprecated methods

dstansby · dstansby · commit 89411ff93225 · 2018-02-19T14:24:12.000Z
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -328,28 +328,6 @@ 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):
-        raise IOError("'%s' does not exist" % filename)
-    base, extension = filename.rsplit('.', 1)
-    verifier = verifiers.get(extension, None)
-    if verifier is not None:
-        cmd = verifier(filename)
-        pipe = subprocess.Popen(cmd, universal_newlines=True,
-                                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = pipe.communicate()
-        errcode = pipe.wait()
-        if errcode != 0:
-            msg = "File verification command failed:\n%s\n" % ' '.join(cmd)
-            if stdout:
-                msg += "Standard output:\n%s\n" % stdout
-            if stderr:
-                msg += "Standard error:\n%s\n" % stderr
-            raise IOError(msg)
-
-
 def crop_to_same(actual_path, actual_image, expected_path, expected_image):
     # clip the images to the same size -- this is useful only when
     # comparing eps to pdf
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -321,12 +321,6 @@ def setup(self):
     def teardown(self):
         self.teardown_class()
 
-    @staticmethod
-    @cbook.deprecated('2.1',
-                      alternative='remove_ticks_and_titles')
-    def remove_text(figure):
-        remove_ticks_and_titles(figure)
-
     def nose_runner(self):
         func = self.compare
         func = _checked_on_freetype_version(self.freetype_version)(func)
