Have image tests default to 'classic' style.

WeatherGod · WeatherGod · commit 4365e954035e · 2015-07-28T13:39:05.000-04:00
diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py
@@ -42,6 +42,9 @@ def is_style_file(filename):
 def use(style):
     """Use matplotlib style settings from a style specification.
 
+    The style name of 'default' is reserved for reverting back to
+    the default style settings.
+
     Parameters
     ----------
     style : str, dict, or list
@@ -70,6 +73,9 @@ def use(style):
         if not cbook.is_string_like(style):
             mpl.rcParams.update(style)
             continue
+        elif style == 'default':
+            mpl.rcdefaults()
+            continue
 
         if style in library:
             mpl.rcParams.update(library[style])
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -21,6 +21,7 @@
 from matplotlib import ticker
 from matplotlib import pyplot as plt
 from matplotlib import ft2font
+from matplotlib.style import context as style_context
 from matplotlib.testing.noseclasses import KnownFailureTest, \
      KnownFailureDidNotFailTest, ImageComparisonFailure
 from matplotlib.testing.compare import comparable_formats, compare_images, \
@@ -132,7 +133,8 @@ class ImageComparisonTest(CleanupTest):
     def setup_class(cls):
         CleanupTest.setup_class()
 
-        cls._func()
+        with style_context(cls._style):
+            cls._func()
 
     @staticmethod
     def remove_text(figure):
@@ -206,7 +208,7 @@ def do_test():
 
 def image_comparison(baseline_images=None, extensions=None, tol=13,
                      freetype_version=None, remove_text=False,
-                     savefig_kwarg=None):
+                     savefig_kwarg=None, style='classic'):
     """
     call signature::
 
@@ -243,6 +245,11 @@ def image_comparison(baseline_images=None, extensions=None, tol=13,
       *savefig_kwarg*: dict
         Optional arguments that are passed to the savefig method.
 
+      *style*: string
+        Optional name for the base style to apply to the image
+        test. The test itself can also apply additional styles
+        if desired. Defaults to the 'classic' style.
+
     """
 
     if baseline_images is None:
@@ -280,7 +287,8 @@ def compare_images_decorator(func):
              '_tol': tol,
              '_freetype_version': freetype_version,
              '_remove_text': remove_text,
-             '_savefig_kwarg': savefig_kwarg})
+             '_savefig_kwarg': savefig_kwarg,
+             '_style': style})
 
         return new_class
     return compare_images_decorator
