Merge pull request matplotlib#952 from pelson/gridspec_demo_fix

Fix to gridspec06 demo

Author: pelson

doc/users/plotting/examples/demo_gridspec06.py

@@ -18,7 +18,7 @@ def product(*args, **kwds):
 def squiggle_xy(a, b, c, d, i=np.arange(0.0, 2*np.pi, 0.05)):
     return np.sin(i*a)*np.cos(i*b), np.sin(i*c)*np.cos(i*d)
 
-f = plt.figure(figsize=(8, 8))
+fig = plt.figure(figsize=(8, 8))
 
 # gridspec inside gridspec
 outer_grid = gridspec.GridSpec(4, 4, wspace=0.0, hspace=0.0)
@@ -28,13 +28,13 @@ def squiggle_xy(a, b, c, d, i=np.arange(0.0, 2*np.pi, 0.05)):
             subplot_spec=outer_grid[i], wspace=0.0, hspace=0.0)
     a, b = int(i/4)+1,i%4+1
     for j, (c, d) in enumerate(product(range(1, 4), repeat=2)):
-        ax = plt.Subplot(f, inner_grid[j])
+        ax = plt.Subplot(fig, inner_grid[j])
         ax.plot(*squiggle_xy(a, b, c, d))
         ax.set_xticks([])
         ax.set_yticks([])
-        f.add_subplot(ax)
+        fig.add_subplot(ax)
 
-all_axes = f.get_axes()
+all_axes = fig.get_axes()
 
 #show only the outside spines
 for ax in all_axes:

lib/matplotlib/figure.py

@@ -791,7 +791,9 @@ def add_subplot(self, *args, **kwargs):
 
             a = args[0]
             assert(a.get_figure() is self)
-            key = self._make_key(*args[1:], **kwargs)
+            # make a key for the subplot (which includes the axes object id
+            # in the hash)
+            key = self._make_key(*args, **kwargs)
         else:
             projection_class, kwargs, key = \
                         process_projection_requirements(self, *args, **kwargs)