Fixed post draw pickling of Line2D

Author: pelson

lib/matplotlib/lines.py

@@ -352,6 +352,12 @@ def __init__(self, xdata, ydata,
         self._invalidy = True
         self.set_data(xdata, ydata)
 
+    def __getstate__(self):
+        state = super(Line2D, self).__getstate__()
+        # _linefunc will be restored on draw time.
+        state.pop('_lineFunc', None)
+        return state
+
     def contains(self, mouseevent):
         """
         Test whether the mouse event occurred on the line.  The pick

lib/matplotlib/tests/test_pickle.py

@@ -107,6 +107,8 @@ def test_simple():
     plt.plot(list(xrange(10)), label='foobar')
     plt.legend()
 
+    # Uncomment to debug any unpicklable objects. This is slow so is not
+    # uncommented by default.
 #    recursive_pickle(fig)
     pickle.dump(ax, BytesIO(), pickle.HIGHEST_PROTOCOL)
 
@@ -217,12 +219,25 @@ def test_image():
     from matplotlib.backends.backend_agg import new_figure_manager
     manager = new_figure_manager(1000)
     fig = manager.canvas.figure
-    ax = fig.add_subplot(1,1,1)
+    ax = fig.add_subplot(1, 1, 1)
     ax.imshow(np.arange(12).reshape(3, 4))
     manager.canvas.draw()
     pickle.dump(fig, BytesIO())
 
 
+def test_grid():
+    from matplotlib.backends.backend_agg import new_figure_manager
+    manager = new_figure_manager(1000)
+    fig = manager.canvas.figure
+    ax = fig.add_subplot(1, 1, 1)
+    ax.grid()
+    # Drawing the grid triggers instance methods to be attached
+    # to the Line2D object (_lineFunc).
+    manager.canvas.draw()
+
+    pickle.dump(ax, BytesIO())
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s'])