Merge pull request matplotlib#1255 from mdboom/fix-tests

Fix test_pickle test.

Author: pelson

lib/matplotlib/tests/baseline_images/test_pickle/multi_pickle.png

@@ -14,38 +14,38 @@
 from io import BytesIO
 
 
-def depth_getter(obj, 
-                 current_depth=0, 
-                 depth_stack=None, 
+def depth_getter(obj,
+                 current_depth=0,
+                 depth_stack=None,
                  nest_info='top level object'):
     """
     Returns a dictionary mapping:
-    
+
         id(obj): (shallowest_depth, obj, nest_info)
-    
-    for the given object (and its subordinates). 
-    
-    This, in conjunction with recursive_pickle, can be used to debug 
+
+    for the given object (and its subordinates).
+
+    This, in conjunction with recursive_pickle, can be used to debug
     pickling issues, although finding others is sometimes a case of
     trial and error.
-    
+
     """
     if depth_stack is None:
         depth_stack = {}
-    
+
     if id(obj) in depth_stack:
         stack = depth_stack[id(obj)]
         if stack[0] > current_depth:
             del depth_stack[id(obj)]
         else:
             return depth_stack
-            
+
     depth_stack[id(obj)] = (current_depth, obj, nest_info)
-    
+
     if isinstance(obj, (list, tuple)):
         for i, item in enumerate(obj):
-            depth_getter(item, current_depth=current_depth+1, 
-                         depth_stack=depth_stack, 
+            depth_getter(item, current_depth=current_depth+1,
+                         depth_stack=depth_stack,
                          nest_info='list/tuple item #%s in (%s)' % (i, nest_info))
     else:
         if isinstance(obj, dict):
@@ -58,16 +58,16 @@ def depth_getter(obj,
             state = obj.__dict__
         else:
             state = {}
-            
+
         for key, value in state.iteritems():
-            depth_getter(value, current_depth=current_depth+1, 
-                         depth_stack=depth_stack, 
+            depth_getter(value, current_depth=current_depth+1,
+                         depth_stack=depth_stack,
                          nest_info='attribute "%s" in (%s)' % (key, nest_info))
-    
+
         # for instancemethod picklability (and some other issues), uncommenting
         # the following may be helpful
 #        print([(name, dobj.__class__) for name, dobj in state.iteritems()], ': ', nest_info, ';', type(obj))
-            
+
     return depth_stack
 
 
@@ -76,14 +76,14 @@ def recursive_pickle(top_obj):
     Recursively pickle all of the given objects subordinates, starting with
     the deepest first. **Very** handy for debugging pickling issues, but
     also very slow (as it literally pickles each object in turn).
-    
+
     Handles circular object references gracefully.
-    
+
     """
     objs = depth_getter(top_obj)
     # sort by depth then by nest_info
     objs = sorted(objs.itervalues(), key=lambda val: (-val[0], val[2]))
-    
+
     for _, obj, location in objs:
 #        print('trying %s' % location)
         try:
@@ -110,90 +110,90 @@ def test_simple():
 
 #    recursive_pickle(fig)
     pickle.dump(ax, BytesIO(), pickle.HIGHEST_PROTOCOL)
-    
+
 #    ax = plt.subplot(121, projection='hammer')
 #    recursive_pickle(ax, 'figure')
 #    pickle.dump(ax, BytesIO(), pickle.HIGHEST_PROTOCOL)
 
 
-@image_comparison(baseline_images=['multi_pickle'], 
-                  extensions=['png'])
+@image_comparison(baseline_images=['multi_pickle'],
+                  extensions=['png'], remove_text=True)
 def test_complete():
     fig = plt.figure('Figure with a label?', figsize=(10, 6))
-    
+
     plt.suptitle('Can you fit any more in a figure?')
-    
+
     # make some arbitrary data
     x, y = np.arange(8), np.arange(10)
     data = u = v = np.linspace(0, 10, 80).reshape(10, 8)
     v = np.sin(v * -0.6)
-    
+
     plt.subplot(3,3,1)
     plt.plot(range(10))
-    
+
     plt.subplot(3, 3, 2)
     plt.contourf(data, hatches=['//', 'ooo'])
     plt.colorbar()
-    
+
     plt.subplot(3, 3, 3)
     plt.pcolormesh(data)
-    
-    
+
+
     plt.subplot(3, 3, 4)
     plt.imshow(data)
-    
+
     plt.subplot(3, 3, 5)
     plt.pcolor(data)
-    
+
     plt.subplot(3, 3, 6)
     plt.streamplot(x, y, u, v)
-    
+
     plt.subplot(3, 3, 7)
     plt.quiver(x, y, u, v)
-    
+
     plt.subplot(3, 3, 8)
     plt.scatter(x, x**2, label='$x^2$')
     plt.legend(loc='upper left')
-    
+
     plt.subplot(3, 3, 9)
     plt.errorbar(x, x * -0.5, xerr=0.2, yerr=0.4)
-    
+
     ###### plotting is done, now test its pickle-ability #########
-    
+
     # Uncomment to debug any unpicklable objects. This is slow (~200 seconds).
 #    recursive_pickle(fig)
-    
+
     result_fh = BytesIO()
     pickle.dump(fig, result_fh, pickle.HIGHEST_PROTOCOL)
-    
+
     plt.close('all')
-    
+
     # make doubly sure that there are no figures left
     assert_equal(plt._pylab_helpers.Gcf.figs, {})
-    
+
     # wind back the fh and load in the figure
     result_fh.seek(0)
     fig = pickle.load(result_fh)
-    
+
     # make sure there is now a figure manager
     assert_not_equal(plt._pylab_helpers.Gcf.figs, {})
-    
+
     assert_equal(fig.get_label(), 'Figure with a label?')
-    
-    
+
+
 def test_no_pyplot():
     # tests pickle-ability of a figure not created with pyplot
-    
+
     import pickle as p
     from matplotlib.backends.backend_pdf import FigureCanvasPdf as fc
     from matplotlib.figure import Figure
-    
+
     fig = Figure()
     can = fc(fig)
     ax = fig.add_subplot(1, 1, 1)
     ax.plot([1, 2, 3], [1, 2, 3])
-    
-    # Uncomment to debug any unpicklable objects. This is slow so is not 
+
+    # Uncomment to debug any unpicklable objects. This is slow so is not
     # uncommented by default.
 #    recursive_pickle(fig)
     pickle.dump(fig, BytesIO(), pickle.HIGHEST_PROTOCOL)