Avoid leaking file descriptors in tests and examples

joferkington · joferkington · commit bdbc7df2579b · 2014-07-26T10:23:42.000-05:00
diff --git a/examples/mplot3d/custom_shaded_3d_surface.py b/examples/mplot3d/custom_shaded_3d_surface.py
@@ -8,12 +8,13 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-dem = np.load(cbook.get_sample_data('jacksboro_fault_dem.npz'))
-z = dem['elevation']
-nrows, ncols = z.shape
-x = np.linspace(dem['xmin'], dem['xmax'], ncols)
-y = np.linspace(dem['ymin'], dem['ymax'], nrows)
-x, y = np.meshgrid(x, y)
+filename = cbook.get_sample_data('jacksboro_fault_dem.npz', asfileobj=False)
+with np.load(filename) as dem:
+    z = dem['elevation']
+    nrows, ncols = z.shape
+    x = np.linspace(dem['xmin'], dem['xmax'], ncols)
+    y = np.linspace(dem['ymin'], dem['ymax'], nrows)
+    x, y = np.meshgrid(x, y)
 
 region = np.s_[5:50, 5:50]
 x, y, z = x[region], y[region], z[region]
diff --git a/examples/pylab_examples/shading_example.py b/examples/pylab_examples/shading_example.py
@@ -1,7 +1,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.colors import LightSource
-from matplotlib import cbook
+from matplotlib.cbook import get_sample_data
 
 # Example showing how to make shaded relief plots
 # like Mathematica
@@ -13,11 +13,15 @@ def main():
     # Test data
     x, y = np.mgrid[-5:5:0.05, -5:5:0.05]
     z = 5 * (np.sqrt(x**2 + y**2) + np.sin(x**2 + y**2))
+
+    filename = get_sample_data('jacksboro_fault_dem.npz', asfileobj=False)
+    with np.load(filename) as dem:
+        elev = dem['elevation']
+
     fig = compare(z, plt.cm.copper)
     fig.suptitle('HSV Blending Looks Best with Smooth Surfaces', y=0.95)
 
-    dem = np.load(cbook.get_sample_data('jacksboro_fault_dem.npz'))
-    fig = compare(dem['elevation'], plt.cm.gist_earth, ve=0.05)
+    fig = compare(elev, plt.cm.gist_earth, ve=0.05)
     fig.suptitle('Overlay Blending Looks Best with Rough Surfaces', y=0.95)
 
     plt.show()
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -234,16 +234,16 @@ def gray_from_float_rgba():
                   extensions=['png'])
 def test_light_source_topo_surface():
     """Shades a DEM using different v.e.'s and blend modes."""
-    dem = np.load(cbook.get_sample_data('jacksboro_fault_dem.npz'))
-
-    # Get the true cellsize in meters for accurate vertical exaggeration
-    #   Convert from decimal degrees to meters
-    dx, dy = dem['dx'], dem['dy']
-    dx = 111320.0 * dx * np.cos(dem['ymin'])
-    dy = 111320.0 * dy
+    fname = cbook.get_sample_data('jacksboro_fault_dem.npz', asfileobj=False)
+    with np.load(fname) as dem:
+        elev = dem['elevation']
+        # Get the true cellsize in meters for accurate vertical exaggeration
+        #   Convert from decimal degrees to meters
+        dx, dy = dem['dx'], dem['dy']
+        dx = 111320.0 * dx * np.cos(dem['ymin'])
+        dy = 111320.0 * dy
 
     ls = mcolors.LightSource(315, 45)
-    elev = dem['elevation']
     cmap = cm.gist_earth
 
     fig, axes = plt.subplots(nrows=3, ncols=3)
