Merge remote-tracking branch 'upstream/v1.3.x'

mdboom · mdboom · commit c38a71e59750 · 2014-01-27T11:39:06.000-05:00
Conflicts:
	lib/matplotlib/quiver.py
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1329,6 +1329,7 @@ def tk_window_focus():
     'matplotlib.tests.test_patheffects',
     'matplotlib.tests.test_pickle',
     'matplotlib.tests.test_png',
+    'matplotlib.tests.test_quiver',
     'matplotlib.tests.test_rcparams',
     'matplotlib.tests.test_scale',
     'matplotlib.tests.test_simplification',
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -14,15 +14,15 @@
 the Quiver code.
 """
 
-
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
 import six
+import weakref
 
 import numpy as np
 from numpy import ma
-import matplotlib.collections as collections
+import matplotlib.collections as mcollections
 import matplotlib.transforms as transforms
 import matplotlib.text as mtext
 import matplotlib.artist as martist
@@ -223,9 +223,9 @@
 
 class QuiverKey(martist.Artist):
     """ Labelled arrow for use as a quiver plot scale key."""
-    halign = {'N': 'center', 'S': 'center', 'E': 'left',   'W': 'right'}
-    valign = {'N': 'bottom', 'S': 'top',    'E': 'center', 'W': 'center'}
-    pivot = {'N': 'mid',    'S': 'mid',    'E': 'tip',    'W': 'tail'}
+    halign = {'N': 'center', 'S': 'center', 'E': 'left', 'W': 'right'}
+    valign = {'N': 'bottom', 'S': 'top', 'E': 'center', 'W': 'center'}
+    pivot = {'N': 'mid', 'S': 'mid', 'E': 'tip', 'W': 'tail'}
 
     def __init__(self, Q, X, Y, U, label, **kw):
         martist.Artist.__init__(self)
@@ -239,13 +239,19 @@ def __init__(self, Q, X, Y, U, label, **kw):
         self._labelsep_inches = kw.pop('labelsep', 0.1)
         self.labelsep = (self._labelsep_inches * Q.ax.figure.dpi)
 
+        # try to prevent closure over the real self
+        weak_self = weakref.ref(self)
+
         def on_dpi_change(fig):
-            self.labelsep = (self._labelsep_inches * fig.dpi)
-            self._initialized = False  # simple brute force update
-                                       # works because _init is called
-                                       # at the start of draw.
+            self_weakref = weak_self()
+            if self_weakref is not None:
+                self_weakref.labelsep = (self_weakref._labelsep_inches*fig.dpi)
+                self_weakref._initialized = False  # simple brute force update
+                                           # works because _init is called
+                                           # at the start of draw.
 
-        Q.ax.figure.callbacks.connect('dpi_changed', on_dpi_change)
+        self._cid = Q.ax.figure.callbacks.connect('dpi_changed',
+                                                  on_dpi_change)
 
         self.labelpos = kw.pop('labelpos', 'N')
         self.labelcolor = kw.pop('labelcolor', None)
@@ -258,11 +264,21 @@ def on_dpi_change(fig):
                         horizontalalignment=self.halign[self.labelpos],
                         verticalalignment=self.valign[self.labelpos],
                         fontproperties=font_manager.FontProperties(**_fp))
+
         if self.labelcolor is not None:
             self.text.set_color(self.labelcolor)
         self._initialized = False
         self.zorder = Q.zorder + 0.1
 
+    def remove(self):
+        """
+        Overload the remove method
+        """
+        self.Q.ax.figure.callbacks.disconnect(self._cid)
+        self._cid = None
+        # pass the remove call up the stack
+        martist.Artist.remove(self)
+
     __init__.__doc__ = _quiverkey_doc
 
     def _init(self):
@@ -279,7 +295,7 @@ def _init(self):
             self.Q.pivot = _pivot
             kw = self.Q.polykw
             kw.update(self.kw)
-            self.vector = collections.PolyCollection(
+            self.vector = mcollections.PolyCollection(
                                         self.verts,
                                         offsets=[(self.X, self.Y)],
                                         transOffset=self.get_transform(),
@@ -368,7 +384,7 @@ def _parse_args(*args):
     return X, Y, U, V, C
 
 
-class Quiver(collections.PolyCollection):
+class Quiver(mcollections.PolyCollection):
     """
     Specialized PolyCollection for arrows.
 
@@ -415,7 +431,7 @@ def __init__(self, ax, *args, **kw):
         self.transform = kw.pop('transform', ax.transData)
         kw.setdefault('facecolors', self.color)
         kw.setdefault('linewidths', (0,))
-        collections.PolyCollection.__init__(self, [], offsets=self.XY,
+        mcollections.PolyCollection.__init__(self, [], offsets=self.XY,
                                             transOffset=self.transform,
                                             closed=False,
                                             **kw)
@@ -426,14 +442,30 @@ def __init__(self, ax, *args, **kw):
         self.keyvec = None
         self.keytext = None
 
-        def on_dpi_change(fig):
-            self._new_UV = True  # vertices depend on width, span
-                                 # which in turn depend on dpi
-            self._initialized = False  # simple brute force update
-                                       # works because _init is called
-                                       # at the start of draw.
+        # try to prevent closure over the real self
+        weak_self = weakref.ref(self)
 
-        self.ax.figure.callbacks.connect('dpi_changed', on_dpi_change)
+        def on_dpi_change(fig):
+            self_weakref = weak_self()
+            if self_weakref is not None:
+                self_weakref._new_UV = True  # vertices depend on width, span
+                                     # which in turn depend on dpi
+                self_weakref._initialized = False  # simple brute force update
+                                           # works because _init is called
+                                           # at the start of draw.
+
+        self._cid = self.ax.figure.callbacks.connect('dpi_changed',
+                                                     on_dpi_change)
+
+    def remove(self):
+        """
+        Overload the remove method
+        """
+        # disconnect the call back
+        self.ax.figure.callbacks.disconnect(self._cid)
+        self._cid = None
+        # pass the remove call up the stack
+        mcollections.PolyCollection.remove(self)
 
     def _init(self):
         """
@@ -460,7 +492,7 @@ def draw(self, renderer):
             verts = self._make_verts(self.U, self.V)
             self.set_verts(verts, closed=False)
             self._new_UV = False
-        collections.PolyCollection.draw(self, renderer)
+        mcollections.PolyCollection.draw(self, renderer)
 
     def set_UVC(self, U, V, C=None):
         U = ma.masked_invalid(U, copy=False).ravel()
@@ -793,7 +825,7 @@ def _h_arrows(self, length):
 docstring.interpd.update(barbs_doc=_barbs_doc)
 
 
-class Barbs(collections.PolyCollection):
+class Barbs(mcollections.PolyCollection):
     '''
     Specialized PolyCollection for barbs.
 
@@ -854,8 +886,9 @@ def __init__(self, ax, *args, **kw):
 
         #Make a collection
         barb_size = self._length ** 2 / 4  # Empirically determined
-        collections.PolyCollection.__init__(self, [], (barb_size,), offsets=xy,
-                                            transOffset=transform, **kw)
+        mcollections.PolyCollection.__init__(self, [], (barb_size,),
+                                             offsets=xy,
+                                             transOffset=transform, **kw)
         self.set_transform(transforms.IdentityTransform())
 
         self.set_UVC(u, v, c)
@@ -1078,7 +1111,7 @@ def set_offsets(self, xy):
         x, y, u, v = delete_masked_points(self.x.ravel(), self.y.ravel(),
                                           self.u, self.v)
         xy = np.hstack((x[:, np.newaxis], y[:, np.newaxis]))
-        collections.PolyCollection.set_offsets(self, xy)
-    set_offsets.__doc__ = collections.PolyCollection.set_offsets.__doc__
+        mcollections.PolyCollection.set_offsets(self, xy)
+    set_offsets.__doc__ = mcollections.PolyCollection.set_offsets.__doc__
 
     barbs_doc = _barbs_doc
diff --git a/lib/matplotlib/tests/test_quiver.py b/lib/matplotlib/tests/test_quiver.py
@@ -0,0 +1,54 @@
+from __future__ import print_function
+import os
+import tempfile
+import numpy as np
+import sys
+from matplotlib import pyplot as plt
+from matplotlib.testing.decorators import cleanup
+
+
+WRITER_OUTPUT = dict(ffmpeg='mp4', ffmpeg_file='mp4',
+                     mencoder='mp4', mencoder_file='mp4',
+                     avconv='mp4', avconv_file='mp4',
+                     imagemagick='gif', imagemagick_file='gif')
+
+
+@cleanup
+def test_quiver_memory_leak():
+    fig, ax = plt.subplots()
+
+    X, Y = np.meshgrid(np.arange(0, 2 * np.pi, .04),
+                        np.arange(0, 2 * np.pi, .04))
+    U = np.cos(X)
+    V = np.sin(Y)
+
+    Q = ax.quiver(U, V)
+    ttX = Q.X
+    Q.remove()
+
+    del Q
+
+    assert sys.getrefcount(ttX) == 2
+
+
+@cleanup
+def test_quiver_key_memory_leak():
+    fig, ax = plt.subplots()
+
+    X, Y = np.meshgrid(np.arange(0, 2 * np.pi, .04),
+                        np.arange(0, 2 * np.pi, .04))
+    U = np.cos(X)
+    V = np.sin(Y)
+
+    Q = ax.quiver(U, V)
+
+    qk = ax.quiverkey(Q, 0.5, 0.92, 2, r'$2 \frac{m}{s}$',
+                   labelpos='W',
+                   fontproperties={'weight': 'bold'})
+    assert sys.getrefcount(qk) == 3
+    qk.remove()
+    assert sys.getrefcount(qk) == 2
+
+if __name__ == '__main__':
+    import nose
+    nose.runmodule()
