Update axes_grid1 overview

Remove all use of axisartist from overview of axes_grid1
matplotlib · WeatherGod · Jan 8, 2016 · Dec 26, 2015 · Dec 26, 2015 · Dec 26, 2015
commit 44fb5ea5de9fea9b88ea0d64c55ea549bc6bca8c
diff --git a/doc/mpl_toolkits/axes_grid1/index.rst b/doc/mpl_toolkits/axes_grid1/index.rst
@@ -7,7 +7,7 @@ Matplotlib AxesGrid1 Toolkit
 The matplotlib :class:`mpl_toolkits.axes_grid1` toolkit is a collection of
 helper classes to ease displaying multiple images in matplotlib.  While the
 aspect parameter in matplotlib adjust the position of the single axes,
-AxesGrid1 toolkit provides a framework to adjust the position of
+axesgrid1 toolkit provides a framework to adjust the position of
 multiple axes according to their aspects.
 
 
@@ -16,7 +16,7 @@ multiple axes according to their aspects.
 .. note::
    AxesGrid toolkit has been a part of matplotlib since v
    0.99. Originally, the toolkit had a single namespace of
-   *axes_grid*. In more recent version (since svn r8226), the toolkit
+   *axes_grid*. In more recent version, the toolkit
    has divided into two separate namespace (*axes_grid1* and *axisartist*).
    While *axes_grid* namespace is maintained for the backward compatibility,
    use of *axes_grid1* and *axisartist* is recommended.

diff --git a/doc/mpl_toolkits/axes_grid1/overview.rst b/doc/mpl_toolkits/axes_grid1/overview.rst
@@ -2,10 +2,10 @@
 Overview of AxesGrid1 toolkit
 =============================
 
-What is AxesGrid1 toolkit?
-==========================
+What is axes_grid1 toolkit?
+===========================
 
-The matplotlib AxesGrid1 toolkit is a collection of helper classes,
+The matplotlib axes_grid1 toolkit is a collection of helper classes,
 mainly to ease displaying (multiple) images in matplotlib.
 
 .. contents::
@@ -38,7 +38,7 @@ like the legend.
 .. plot:: mpl_toolkits/axes_grid1/examples/demo_axes_grid.py
 
 
-Axes_grid1
+axes_grid1
 ==========
 
 ImageGrid
@@ -85,7 +85,7 @@ axes).
 
 
 
-AxesGrid takes following arguments,
+ImageGrid takes following arguments,
 
 
  ============= ========   ================================================
@@ -152,7 +152,7 @@ attribute.
 
 
 
-The examples below show what you can do with AxesGrid.
+The examples below show what you can do with ImageGrid.
 
 .. plot:: mpl_toolkits/axes_grid1/examples/demo_axes_grid.py
 
@@ -267,7 +267,7 @@ tick-formatter for bottom(or left)-axis. ::
                        r"$\pi$", r"$\frac{3}{2}\pi$", r"$2\pi$"])
 
 
-.. plot:: mpl_toolkits/axisartist/examples/simple_axisline4.py
+.. plot:: mpl_toolkits/axis_grid1/examples/simple_axisline4.py
 
 
 
@@ -296,11 +296,11 @@ coordinate.
 InsetLocator
 ------------
 
-:mod:`mpl_toolkits.axes_grid.inset_locator` provides helper classes
+:mod:`mpl_toolkits.axes_grid1.inset_locator` provides helper classes
 and functions to place your (inset) axes at the anchored position of
 the parent axes, similarly to AnchoredArtist.
 
-Using :func:`mpl_toolkits.axes_grid.inset_locator.inset_axes`, you
+Using :func:`mpl_toolkits.axes_grid1.inset_locator.inset_axes`, you
 can have inset axes whose size is either fixed, or a fixed proportion
 of the parent axes. For example,::
 

diff --git a/examples/axes_grid1/demo_axes_grid.py b/examples/axes_grid1/demo_axes_grid.py
@@ -1,5 +1,5 @@
 import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid1 import AxesGrid
+from mpl_toolkits.axes_grid1 import ImageGrid
 
 
 def get_demo_image():
@@ -16,11 +16,11 @@ def demo_simple_grid(fig):
     A grid of 2x2 images with 0.05 inch pad between images and only
     the lower-left axes is labeled.
     """
-    grid = AxesGrid(fig, 141,  # similar to subplot(141)
-                    nrows_ncols=(2, 2),
-                    axes_pad=0.05,
-                    label_mode="1",
-                    )
+    grid = ImageGrid(fig, 141,  # similar to subplot(141)
+                     nrows_ncols=(2, 2),
+                     axes_pad=0.05,
+                     label_mode="1",
+                     )
 
     Z, extent = get_demo_image()
     for i in range(4):
@@ -36,19 +36,18 @@ def demo_grid_with_single_cbar(fig):
     """
     A grid of 2x2 images with a single colorbar
     """
-    grid = AxesGrid(fig, 142,  # similar to subplot(142)
-                    nrows_ncols=(2, 2),
-                    axes_pad=0.0,
-                    share_all=True,
-                    label_mode="L",
-                    cbar_location="top",
-                    cbar_mode="single",
-                    )
+    grid = ImageGrid(fig, 142,  # similar to subplot(142)
+                     nrows_ncols=(2, 2),
+                     axes_pad=0.0,
+                     share_all=True,
+                     label_mode="L",
+                     cbar_location="top",
+                     cbar_mode="single",
+                     )
 
     Z, extent = get_demo_image()
     for i in range(4):
         im = grid[i].imshow(Z, extent=extent, interpolation="nearest")
-    #plt.colorbar(im, cax = grid.cbar_axes[0])
     grid.cbar_axes[0].colorbar(im)
 
     for cax in grid.cbar_axes:
@@ -64,16 +63,16 @@ def demo_grid_with_each_cbar(fig):
     A grid of 2x2 images. Each image has its own colorbar.
     """
 
-    grid = AxesGrid(fig, 143,  # similar to subplot(143)
-                    nrows_ncols=(2, 2),
-                    axes_pad=0.1,
-                    label_mode="1",
-                    share_all=True,
-                    cbar_location="top",
-                    cbar_mode="each",
-                    cbar_size="7%",
-                    cbar_pad="2%",
-                    )
+    grid = ImageGrid(fig, 143,  # similar to subplot(143)
+                     nrows_ncols=(2, 2),
+                     axes_pad=0.1,
+                     label_mode="1",
+                     share_all=True,
+                     cbar_location="top",
+                     cbar_mode="each",
+                     cbar_size="7%",
+                     cbar_pad="2%",
+                     )
     Z, extent = get_demo_image()
     for i in range(4):
         im = grid[i].imshow(Z, extent=extent, interpolation="nearest")
@@ -92,16 +91,16 @@ def demo_grid_with_each_cbar_labelled(fig):
     A grid of 2x2 images. Each image has its own colorbar.
     """
 
-    grid = AxesGrid(fig, 144,  # similar to subplot(144)
-                    nrows_ncols=(2, 2),
-                    axes_pad=(0.45, 0.15),
-                    label_mode="1",
-                    share_all=True,
-                    cbar_location="right",
-                    cbar_mode="each",
-                    cbar_size="7%",
-                    cbar_pad="2%",
-                    )
+    grid = ImageGrid(fig, 144,  # similar to subplot(144)
+                     nrows_ncols=(2, 2),
+                     axes_pad=(0.45, 0.15),
+                     label_mode="1",
+                     share_all=True,
+                     cbar_location="right",
+                     cbar_mode="each",
+                     cbar_size="7%",
+                     cbar_pad="2%",
+                     )
     Z, extent = get_demo_image()
 
     # Use a different colorbar range every time

diff --git a/examples/axisartist/simple_axisline4.py → examples/axes_grid1/simple_axisline4.py b/examples/axisartist/simple_axisline4.py → examples/axes_grid1/simple_axisline4.py
@@ -3,7 +3,7 @@
 import mpl_toolkits.axisartist as AA
 import numpy as np
 
-ax = host_subplot(111, axes_class=AA.Axes)
+ax = host_subplot(111)
 xx = np.arange(0, 2*np.pi, 0.01)
 ax.plot(xx, np.sin(xx))