matplotlib · mdboom · Jul 10, 2015 · Jul 10, 2015 · Nov 6, 2015 · Nov 8, 2015
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -733,8 +733,8 @@ class NonUniformImage(AxesImage):
     def __init__(self, ax, **kwargs):
         """
         kwargs are identical to those for AxesImage, except
-        that 'interpolation' defaults to 'nearest', and 'bilinear'
-        is the only alternative.
+        that 'nearest' and 'bilinear' are the only supported 'interpolation'
+        options.
         """
         interp = kwargs.pop('interpolation', 'nearest')
         AxesImage.__init__(self, ax,

diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -894,7 +894,7 @@ def validate_cycler(s):
     'mathtext.fallback_to_cm': [True, validate_bool],
 
     'image.aspect':        ['equal', validate_aspect],  # equal, auto, a number
-    'image.interpolation': ['bilinear', six.text_type],
+    'image.interpolation': ['nearest', six.text_type],
     'image.cmap':          ['jet', six.text_type],        # one of gray, jet, etc
     'image.lut':           [256, validate_int],  # lookup table
     'image.origin':        ['upper', six.text_type],  # lookup table

diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -22,6 +22,7 @@
 from matplotlib import ticker
 from matplotlib import pyplot as plt
 from matplotlib import ft2font
+from matplotlib import rcParams
 from matplotlib.testing.noseclasses import KnownFailureTest, \
      KnownFailureDidNotFailTest, ImageComparisonFailure
 from matplotlib.testing.compare import comparable_formats, compare_images, \
@@ -138,6 +139,7 @@ def check_freetype_version(ver):
 class ImageComparisonTest(CleanupTest):
     @classmethod
     def setup_class(cls):
+        CleanupTest.setup_class()
         cls._initial_settings = mpl.rcParams.copy()
         try:
             matplotlib.style.use(cls._style)
@@ -146,11 +148,8 @@ def setup_class(cls):
             mpl.rcParams.clear()
             mpl.rcParams.update(cls._initial_settings)
             raise
-        # Because the setup of a CleanupTest might involve
-        # modifying a few rcparams, this setup should come
-        # last prior to running the image test.
-        CleanupTest.setup_class()
         cls.original_settings = cls._initial_settings
+        matplotlib.tests.set_font_settings_for_testing()
         cls._func()
 
     @classmethod

diff --git a/lib/matplotlib/tests/__init__.py b/lib/matplotlib/tests/__init__.py
@@ -22,6 +22,12 @@
         'test data.')
 
 
+def set_font_settings_for_testing():
+    rcParams['font.family'] = 'DejaVu Sans'
+    rcParams['text.hinting'] = False
+    rcParams['text.hinting_factor'] = 8
+
+
 def setup():
     # The baseline images are created in this locale, so we should use
     # it during all of the tests.
@@ -45,9 +51,8 @@ def setup():
     # tests and are not necessarily the default values as specified in
     # rcsetup.py
     rcdefaults()  # Start with all defaults
-    rcParams['font.family'] = 'DejaVu Sans'
-    rcParams['text.hinting'] = False
-    rcParams['text.hinting_factor'] = 8
+
+    set_font_settings_for_testing()
 
 
 def assert_str_equal(reference_str, test_str,

diff --git a/lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf b/lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/symlog.png b/lib/matplotlib/tests/baseline_images/test_axes/symlog.png