Make conversion_cache private

jkseppan · jkseppan · commit 2136a264d2eb · 2017-02-20T14:43:50.000+02:00
diff --git a/lib/matplotlib/testing/_conversion_cache.py b/lib/matplotlib/testing/_conversion_cache.py
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -12,7 +12,7 @@
 import matplotlib
 from matplotlib import cbook
 from matplotlib.compat import subprocess
-from matplotlib.testing import conversion_cache as ccache
+from matplotlib.testing import _conversion_cache as ccache
 from matplotlib.testing.exceptions import ImageComparisonFailure
 from matplotlib import _png
 
diff --git a/lib/matplotlib/testing/conftest.py b/lib/matplotlib/testing/conftest.py
@@ -1,10 +1,10 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
-
 from six.moves import reduce
 import pytest
 
 import matplotlib
+from matplotlib.testing import _conversion_cache as ccache
 
 
 def pytest_addoption(parser):
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -28,7 +28,7 @@
      make_test_filename
 from . import _copy_metadata, is_called_from_pytest
 from .exceptions import ImageComparisonFailure
-from .conversion_cache import conversion_cache
+from ._conversion_cache import _conversion_cache
 
 
 def _knownfailureif(fail_condition, msg=None, known_exception_class=None):
@@ -199,7 +199,7 @@ def _raise_on_image_difference(expected, actual, tol):
     __tracebackhide__ = True
 
     err = compare_images(expected, actual, tol, in_decorator=True,
-                         cache=conversion_cache)
+                         cache=_conversion_cache)
 
     if not os.path.exists(expected):
         raise ImageComparisonFailure('image does not exist: %s' % expected)
diff --git a/lib/matplotlib/tests/test_cache.py b/lib/matplotlib/tests/test_cache.py
@@ -101,8 +101,8 @@ def test_cache_default_dir():
         pass
 
 
-@raises(CacheError)
-@mock.patch('matplotlib.testing.conversion_cache.cbook.mkdirs',
+@raises(_CacheError)
+@mock.patch('matplotlib.testing._conversion_cache.cbook.mkdirs',
             side_effect=IOError)
 def test_cache_mkdir_error(mkdirs):
     tmpdir = tempfile.mkdtemp()
@@ -112,8 +112,8 @@ def test_cache_mkdir_error(mkdirs):
         shutil.rmtree(tmpdir)
 
 
-@raises(CacheError)
-@mock.patch('matplotlib.testing.conversion_cache.os.access',
+@raises(_CacheError)
+@mock.patch('matplotlib.testing._conversion_cache.os.access',
             side_effect=[False])
 def test_cache_unwritable_error(access):
     tmpdir = tempfile.mkdtemp()
