Merge branch 'master' of https://github.com/matplotlib/matplotlib into cleanup

SidharthBansal · SidharthBansal · commit 88cfd28d549e · 2020-04-06T15:12:14.000+05:30
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -35,29 +35,6 @@ def _cleanup_cm():
         plt.close("all")
 
 
-    def make_cleanup(func):
-        if inspect.isgeneratorfunction(func):
-            @functools.wraps(func)
-            def wrapped_callable(*args, **kwargs):
-                with _cleanup_cm(), matplotlib.style.context(style):
-                    yield from func(*args, **kwargs)
-        else:
-            @functools.wraps(func)
-            def wrapped_callable(*args, **kwargs):
-                with _cleanup_cm(), matplotlib.style.context(style):
-                    func(*args, **kwargs)
-
-        return wrapped_callable
-
-    if callable(style):
-        result = make_cleanup(style)
-        # Default of mpl_test_settings fixture and image_comparison too.
-        style = ["classic", "_classic_test_patch"]
-        return result
-    else:
-        return make_cleanup
-
-
 def check_freetype_version(ver):
     if ver is None:
         return True
