Add more instances of lazy loading

mdboom · mdboom · commit b4880c9efaf9 · 2018-11-08T21:51:28.000-05:00
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -17,7 +17,7 @@
 
 import matplotlib
 from matplotlib.testing.exceptions import ImageComparisonFailure
-from matplotlib import _png, cbook
+from matplotlib import cbook
 
 __all__ = ['compare_float', 'compare_images', 'comparable_formats']
 
@@ -386,6 +386,8 @@ def compare_images(expected, actual, tol, in_decorator=False):
     compare_images(img1, img2, 0.001):
 
     """
+    from matplotlib import _png
+
     if not os.path.exists(actual):
         raise Exception("Output image %s does not exist." % actual)
 
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -40,7 +40,7 @@
 import numpy as np
 
 import matplotlib as mpl
-from matplotlib import _png, cbook, dviread, rcParams
+from matplotlib import cbook, dviread, rcParams
 
 _log = logging.getLogger(__name__)
 
@@ -414,6 +414,7 @@ def get_ps_bbox(self, tex, fontsize):
 
     def get_grey(self, tex, fontsize=None, dpi=None):
         """Return the alpha channel."""
+        from matplotlib import _png
         key = tex, self.get_font_config(), fontsize, dpi
         alpha = self.grey_arrayd.get(key)
         if alpha is None:
diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py
@@ -2,7 +2,6 @@
 
 from matplotlib.contour import ContourSet
 from matplotlib.tri.triangulation import Triangulation
-import matplotlib._tri as _tri
 
 
 class TriContourSet(ContourSet):
@@ -44,6 +43,7 @@ def _process_args(self, *args, **kwargs):
             if self.levels is None:
                 self.levels = args[0].levels
         else:
+            from matplotlib import _tri
             tri, z = self._contour_args(args, kwargs)
             C = _tri.TriContourGenerator(tri.get_cpp_triangulation(), z)
             self._mins = [tri.x.min(), tri.y.min()]
diff --git a/lib/matplotlib/tri/trifinder.py b/lib/matplotlib/tri/trifinder.py
@@ -1,7 +1,6 @@
 import numpy as np
 
 from matplotlib.tri import Triangulation
-import matplotlib._tri as _tri
 
 
 class TriFinder(object):
@@ -35,6 +34,7 @@ class TrapezoidMapTriFinder(TriFinder):
     this should not be relied upon.
     """
     def __init__(self, triangulation):
+        from matplotlib import _tri
         TriFinder.__init__(self, triangulation)
         self._cpp_trifinder = _tri.TrapezoidMapTriFinder(
             triangulation.get_cpp_triangulation())
