don't need the nose make_decorator function any more.

pizzathief · pizzathief · commit c59a7b01b7c2 · 2016-01-22T18:05:34.000+11:00
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -252,35 +252,6 @@ def do_test():
 
                 yield (do_test,)
 
-
-def image_comparison_2(baseline_images=None, extensions=None, tol=0,
-                     freetype_version=None, remove_text=False,
-                     savefig_kwarg=None, style='classic'):
-    if baseline_images is None:
-        raise ValueError('baseline_images must be specified')
-
-    if extensions is None:
-        # default extensions to test
-        extensions = ['png', 'pdf', 'svg']
-
-    if savefig_kwarg is None:
-        #default no kwargs to savefig
-        savefig_kwarg = dict()
-
-    def compare_images_decorator(func):
-        newtest = ImageComparisonTest()
-        newtest._baseline_images = baseline_images
-        newtest._extensions = extensions
-        newtest._tol = tol
-        newtest._freetype_version = freetype_version
-        newtest._remove_text = remove_text
-        newtest._savefig_kwarg = savefig_kwarg
-        newtest._style = style
-        func = newtest.test
-        return func
-    return compare_images_decorator
-
-
 def image_comparison(baseline_images=None, extensions=None, tol=0,
                      freetype_version=None, remove_text=False,
                      savefig_kwarg=None, style='classic'):
@@ -367,7 +338,6 @@ def compare_images_decorator(func):
         return new_class
     return compare_images_decorator
 
-
 def _image_directories(func):
     """
     Compute the baseline and result image directories for testing *func*.
@@ -440,5 +410,5 @@ def backend_switcher(*args, **kwargs):
                 plt.switch_backend(prev_backend)
             return result
 
-        return backend_switcher
+        return nose.tools.make_decorator(func)(backend_switcher)
     return switch_backend_decorator
