removed subplots_iterator, as not really part of this PR

matplotlib · prhbrt · May 11, 2016 · May 11, 2016 · May 11, 2016 · Jul 19, 2016
commit b97e741d9d688418c37d6e345cfa92ae4bf407d7
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1530,7 +1530,6 @@ def _jupyter_nbextension_paths():
     'matplotlib.tests.test_streamplot',
     'matplotlib.tests.test_style',
     'matplotlib.tests.test_subplots',
-    'matplotlib.tests.test_subplots_iterator',
     'matplotlib.tests.test_table',
     'matplotlib.tests.test_text',
     'matplotlib.tests.test_texmanager',

diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1145,33 +1145,6 @@ def subplots(self, nrows=1, ncols=1, sharex=False, sharey=False,
             # Returned axis array will be always 2-d, even if nrows=ncols=1.
             return axarr
 
-    def subplots_iterator(self, nrows=1, ncols=1, show_in_between=False,
-                          sharex=False, sharey=False, squeeze=True,
-                          subplot_kw=None, gridspec_kw=None):
-        """ Iteratively yields the axis object of a rows x cols subplot and
-        creates new subplots when needed"""
-        while True:
-            axes = self.subplots(
-                nrows=nrows,
-                ncols=ncols,
-                sharex=sharex,
-                sharey=sharey,
-                squeeze=False,
-                subplot_kw=subplot_kw,
-                gridspec_kw=gridspec_kw
-            )
-            if axes.shape != (nrows, ncols):
-                raise AssertionError("Matplotlib panic: the returned shape of"
-                                     "subplots() is not what was expected:"
-                                     "{0} != {1}"
-                                     .format(axes.shape, (nrows, ncols))
-                                     )
-            for row in range(nrows):
-                for col in range(ncols):
-                    yield axes[row, col]
-            if show_in_between:
-                self.show(block=False)
-
     def __remove_ax(self, ax):
         def _reset_loc_form(axis):
             axis.set_major_formatter(axis.get_major_formatter())

diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -1156,24 +1156,6 @@ def subplots(nrows=1, ncols=1, sharex=False, sharey=False, squeeze=True,
                        gridspec_kw=gridspec_kw)
     return fig, axs
 
-def subplots_iterator(nrows=1, ncols=1, show_in_between=False, sharex=False,
-                      sharey=False, squeeze=True, subplot_kw=None,
-                      gridspec_kw=None, **fig_kw):
-    """ Iteratively yields the axis object of a rows x cols subplot and creates new subplots when needed"""
-    for axis in (
-        figure(**fig_kw).subplots_iterator(
-            nrows=nrows,
-            ncols=ncols,
-            sharex=sharex,
-            sharey=sharey,
-            squeeze=squeeze,
-            subplot_kw=subplot_kw,
-            gridspec_kw=gridspec_kw
-        )
-    ):
-            yield axis
-
-
 def subplot2grid(shape, loc, rowspan=1, colspan=1, fig=None, **kwargs):
     """
     Create a subplot in a grid.  The grid is specified by *shape*, at

diff --git a/lib/matplotlib/tests/baseline_images/test_subplots_iterator/subplots_offset_text.pdf b/lib/matplotlib/tests/baseline_images/test_subplots_iterator/subplots_offset_text.pdf
diff --git a/...atplotlib/tests/baseline_images/test_subplots_iterator/subplots_offset_text.png b/...atplotlib/tests/baseline_images/test_subplots_iterator/subplots_offset_text.png