matplotlib · Kojoley · Oct 27, 2016 · Oct 23, 2016 · Oct 23, 2016 · Oct 24, 2016
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
@@ -19,7 +19,8 @@
     ...                         'fonts', 'afm', 'ptmr8a.afm')
     >>>
     >>> from matplotlib.afm import AFM
-    >>> afm = AFM(open(afm_fname))
+    >>> with open(afm_fname) as fh:
+    ...     afm = AFM(fh)
     >>> afm.string_width_height('What the heck?')
     (6220.0, 694)
     >>> afm.get_fontname()

diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -413,10 +413,9 @@ def grab_frame(self, **savefig_kwargs):
         try:
             # Tell the figure to save its data to the sink, using the
             # frame format and dpi.
-            myframesink = self._frame_sink()
-            self.fig.savefig(myframesink, format=self.frame_format,
-                             dpi=self.dpi, **savefig_kwargs)
-            myframesink.close()
+            with self._frame_sink() as myframesink:
+                self.fig.savefig(myframesink, format=self.frame_format,
+                                 dpi=self.dpi, **savefig_kwargs)
 
         except RuntimeError:
             out, err = self._proc.communicate()

diff --git a/lib/matplotlib/stackplot.py b/lib/matplotlib/stackplot.py
@@ -92,7 +92,9 @@ def stackplot(axes, x, *args, **kwargs):
         center = np.zeros(n)
         total = np.sum(y, 0)
         # multiply by 1/total (or zero) to avoid infinities in the division:
-        inv_total = np.where(total > 0, 1./total, 0)
+        inv_total = np.zeros_like(total)
+        mask = total > 0
+        inv_total[mask] = 1.0 / total[mask]
         increase = np.hstack((y[:, 0:1], np.diff(y)))
         below_size = total - stack
         below_size += 0.5 * y

diff --git a/lib/matplotlib/tests/test_basic.py b/lib/matplotlib/tests/test_basic.py
@@ -3,10 +3,17 @@
 
 import six
 
+import warnings
+
 from nose.tools import assert_equal
 
+from matplotlib.cbook import MatplotlibDeprecationWarning
 from matplotlib.testing.decorators import knownfailureif
-from pylab import *
+with warnings.catch_warnings():
+    warnings.filterwarnings('ignore',
+                            'The finance module has been deprecated in mpl 2',
+                            MatplotlibDeprecationWarning)
+    from pylab import *
 
 
 def test_simple():

diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
@@ -578,7 +578,7 @@ def get_transform(self):
 @cleanup
 def test_picking():
     fig, ax = plt.subplots()
-    col = ax.scatter([0], [0], [1000])
+    col = ax.scatter([0], [0], [1000], picker=True)
     fig.savefig(io.BytesIO(), dpi=fig.dpi)
 
     class MouseEvent(object):

diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
@@ -108,19 +108,18 @@ def test_contour_shape_mismatch_4():
     try:
         ax.contour(b, g, z)
     except TypeError as exc:
-        print(exc.args[0])
         assert re.match(
             r'Shape of x does not match that of z: ' +
             r'found \(9L?, 9L?\) instead of \(9L?, 10L?\)\.',
-            exc.args[0]) is not None
+            exc.args[0]) is not None, exc.args[0]
 
     try:
         ax.contour(g, b, z)
     except TypeError as exc:
         assert re.match(
             r'Shape of y does not match that of z: ' +
             r'found \(9L?, 9L?\) instead of \(9L?, 10L?\)\.',
-            exc.args[0]) is not None
+            exc.args[0]) is not None, exc.args[0]
 
 
 @cleanup

diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
@@ -1,6 +1,7 @@
 import warnings
 
 from matplotlib.testing.decorators import image_comparison, cleanup
+from matplotlib.cbook import MatplotlibDeprecationWarning
 import matplotlib.pyplot as plt
 import numpy as np
 from nose.tools import assert_raises
@@ -184,6 +185,7 @@ def test_cycle_reset():
     fig, ax = plt.subplots()
     # Need to double-check the old set/get_color_cycle(), too
     with warnings.catch_warnings():
+        warnings.simplefilter("ignore", MatplotlibDeprecationWarning)
         prop = next(ax._get_lines.prop_cycler)
         ax.set_color_cycle(['c', 'm', 'y', 'k'])
         assert prop != next(ax._get_lines.prop_cycler)

diff --git a/lib/matplotlib/tests/test_simplification.py b/lib/matplotlib/tests/test_simplification.py
@@ -8,8 +8,6 @@
 from matplotlib.testing.decorators import image_comparison, knownfailureif, cleanup
 import matplotlib.pyplot as plt
 
-from pylab import *
-import numpy as np
 from matplotlib import patches, path, transforms
 
 from nose.tools import raises
@@ -24,7 +22,7 @@
 @image_comparison(baseline_images=['clipping'], remove_text=True)
 def test_clipping():
     t = np.arange(0.0, 2.0, 0.01)
-    s = np.sin(2*pi*t)
+    s = np.sin(2*np.pi*t)
 
     fig = plt.figure()
     ax = fig.add_subplot(111)
@@ -101,16 +99,16 @@ def test_simplify_curve():
 def test_hatch():
     fig = plt.figure()
     ax = fig.add_subplot(111)
-    ax.add_patch(Rectangle((0, 0), 1, 1, fill=False, hatch="/"))
+    ax.add_patch(plt.Rectangle((0, 0), 1, 1, fill=False, hatch="/"))
     ax.set_xlim((0.45, 0.55))
     ax.set_ylim((0.45, 0.55))
 
 @image_comparison(baseline_images=['fft_peaks'], remove_text=True)
 def test_fft_peaks():
     fig = plt.figure()
-    t = arange(65536)
+    t = np.arange(65536)
     ax = fig.add_subplot(111)
-    p1 = ax.plot(abs(fft(sin(2*pi*.01*t)*blackman(len(t)))))
+    p1 = ax.plot(abs(np.fft.fft(np.sin(2*np.pi*.01*t)*np.blackman(len(t)))))
 
     path = p1[0].get_path()
     transform = p1[0].get_transform()
@@ -163,7 +161,7 @@ def test_start_with_moveto():
 @cleanup
 @raises(OverflowError)
 def test_throw_rendering_complexity_exceeded():
-    rcParams['path.simplify'] = False
+    plt.rcParams['path.simplify'] = False
     xx = np.arange(200000)
     yy = np.random.rand(200000)
     yy[1000] = np.nan
@@ -173,7 +171,7 @@ def test_throw_rendering_complexity_exceeded():
     try:
         fig.savefig(io.BytesIO())
     finally:
-        rcParams['path.simplify'] = True
+        plt.rcParams['path.simplify'] = True
 
 @image_comparison(baseline_images=['clipper_edge'], remove_text=True)
 def test_clipper():

diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
@@ -41,8 +41,8 @@ def test_masks_and_nans():
     X, Y, U, V = velocity_field()
     mask = np.zeros(U.shape, dtype=bool)
     mask[40:60, 40:60] = 1
-    U = np.ma.array(U, mask=mask)
     U[:20, :20] = np.nan
+    U = np.ma.array(U, mask=mask)
     with np.errstate(invalid='ignore'):
         plt.streamplot(X, Y, U, V, color=U, cmap=plt.cm.Blues)
 

diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -176,7 +176,12 @@ def test_ScalarFormatter_offset_value():
     formatter = ax.get_xaxis().get_major_formatter()
 
     def check_offset_for(left, right, offset):
-        ax.set_xlim(left, right)
+        with warnings.catch_warnings(record=True) as w:
+            warnings.filterwarnings('always', 'Attempting to set identical',
+                                    UserWarning)
+            ax.set_xlim(left, right)
+        assert_equal(len(w), 1 if left == right else 0)
+
         # Update ticks.
         next(ax.get_xaxis().iter_ticks())
         assert_equal(formatter.offset, offset)

diff --git a/lib/matplotlib/tests/test_type1font.py b/lib/matplotlib/tests/test_type1font.py
@@ -14,7 +14,8 @@ def test_Type1Font():
     font = t1f.Type1Font(filename)
     slanted = font.transform({'slant': 1})
     condensed = font.transform({'extend': 0.5})
-    rawdata = open(filename, 'rb').read()
+    with open(filename, 'rb') as fd:
+        rawdata = fd.read()
     assert_equal(font.parts[0], rawdata[0x0006:0x10c5])
     assert_equal(font.parts[1], rawdata[0x10cb:0x897f])
     assert_equal(font.parts[2], rawdata[0x8985:0x8ba6])