Clean and fix links in moved examples

dstansby · dstansby · commit bd8cb1e93c85 · 2017-07-23T21:51:32.000+01:00
diff --git a/examples/lines_bars_and_markers/simple_plot.py b/examples/lines_bars_and_markers/simple_plot.py
@@ -10,7 +10,7 @@
 
 # Data for plotting
 t = np.arange(0.0, 2.0, 0.01)
-s = 1 + np.sin(2*np.pi*t)
+s = 1 + np.sin(2 * np.pi * t)
 
 # Note that using plt.subplots below is equivalent to using
 # fig = plt.figure and then ax = fig.add_subplot(111)
diff --git a/examples/misc/table_demo.py b/examples/misc/table_demo.py
@@ -9,11 +9,11 @@
 import matplotlib.pyplot as plt
 
 
-data = [[  66386,  174296,   75131,  577908,   32015],
-        [  58230,  381139,   78045,   99308,  160454],
-        [  89135,   80552,  152558,  497981,  603535],
-        [  78415,   81858,  150656,  193263,   69638],
-        [ 139361,  331509,  343164,  781380,   52269]]
+data = [[66386, 174296, 75131, 577908, 32015],
+        [58230, 381139, 78045, 99308, 160454],
+        [89135, 80552, 152558, 497981, 603535],
+        [78415, 81858, 150656, 193263, 69638],
+        [139361, 331509, 343164, 781380, 52269]]
 
 columns = ('Freeze', 'Wind', 'Flood', 'Quake', 'Hail')
 rows = ['%d year' % x for x in (100, 50, 20, 10, 5)]
@@ -36,7 +36,7 @@
 for row in range(n_rows):
     plt.bar(index, data[row], bar_width, bottom=y_offset, color=colors[row])
     y_offset = y_offset + data[row]
-    cell_text.append(['%1.1f' % (x/1000.0) for x in y_offset])
+    cell_text.append(['%1.1f' % (x / 1000.0) for x in y_offset])
 # Reverse colors and text labels to display the last value at the top.
 colors = colors[::-1]
 cell_text.reverse()
diff --git a/examples/pie_and_polar_charts/polar_demo.py b/examples/pie_and_polar_charts/polar_demo.py
@@ -15,8 +15,8 @@
 ax = plt.subplot(111, projection='polar')
 ax.plot(theta, r)
 ax.set_rmax(2)
-ax.set_rticks([0.5, 1, 1.5, 2])  # less radial ticks
-ax.set_rlabel_position(-22.5)  # get radial labels away from plotted line
+ax.set_rticks([0.5, 1, 1.5, 2])  # Less radial ticks
+ax.set_rlabel_position(-22.5)  # Move radial labels away from plotted line
 ax.grid(True)
 
 ax.set_title("A line plot on a polar axis", va='bottom')
diff --git a/examples/scales/log_demo.py b/examples/scales/log_demo.py
@@ -20,17 +20,17 @@
 fig.subplots_adjust(hspace=0.5)
 
 # log y axis
-ax1.semilogy(t, np.exp(-t/5.0))
+ax1.semilogy(t, np.exp(-t / 5.0))
 ax1.set(title='semilogy')
 ax1.grid()
 
 # log x axis
-ax2.semilogx(t, np.sin(2*np.pi*t))
+ax2.semilogx(t, np.sin(2 * np.pi * t))
 ax2.set(title='semilogx')
 ax2.grid()
 
 # log x and y axis
-ax3.loglog(t, 20*np.exp(-t/10.0), basex=2)
+ax3.loglog(t, 20 * np.exp(-t / 10.0), basex=2)
 ax3.set(title='loglog base 2 on x')
 ax3.grid()
 
@@ -42,7 +42,7 @@
 ax4.set_xscale("log", nonposx='clip')
 ax4.set_yscale("log", nonposy='clip')
 ax4.set(title='Errorbars go negative')
-ax4.errorbar(x, y, xerr=0.1*x, yerr=5.0 + 0.75*y)
+ax4.errorbar(x, y, xerr=0.1 * x, yerr=5.0 + 0.75 * y)
 # ylim must be set after errorbar to allow errorbar to autoscale limits
 ax4.set_ylim(ymin=0.1)
 
diff --git a/examples/shapes_and_collections/ellipse_demo.py b/examples/shapes_and_collections/ellipse_demo.py
@@ -10,9 +10,9 @@
 
 NUM = 250
 
-ells = [Ellipse(xy=np.random.rand(2)*10,
+ells = [Ellipse(xy=np.random.rand(2) * 10,
                 width=np.random.rand(), height=np.random.rand(),
-                angle=np.random.rand()*360)
+                angle=np.random.rand() * 360)
         for i in range(NUM)]
 
 fig, ax = plt.subplots(subplot_kw={'aspect': 'equal'})
diff --git a/examples/shapes_and_collections/fancybox_demo.py b/examples/shapes_and_collections/fancybox_demo.py
@@ -20,7 +20,7 @@
 spacing = 1.2
 
 figheight = (spacing * len(styles) + .5)
-fig1 = plt.figure(1, (4/1.5, figheight/1.5))
+fig1 = plt.figure(1, (4 / 1.5, figheight / 1.5))
 fontsize = 0.3 * 72
 
 for i, stylename in enumerate(sorted(styles)):
@@ -65,8 +65,8 @@ def test1(ax):
             size=10, transform=ax.transAxes)
 
     # draws control points for the fancy box.
-    #l = p_fancy.get_path().vertices
-    #ax.plot(l[:,0], l[:,1], ".")
+    # l = p_fancy.get_path().vertices
+    # ax.plot(l[:,0], l[:,1], ".")
 
     # draw the original bbox in black
     draw_bbox(ax, bb)
@@ -90,15 +90,15 @@ def test2(ax):
 
     p_fancy.set_boxstyle("round,pad=0.1, rounding_size=0.2")
     # or
-    #p_fancy.set_boxstyle("round", pad=0.1, rounding_size=0.2)
+    # p_fancy.set_boxstyle("round", pad=0.1, rounding_size=0.2)
 
     ax.text(0.1, 0.8,
             ' boxstyle="round,pad=0.1\n rounding_size=0.2"',
             size=10, transform=ax.transAxes)
 
     # draws control points for the fancy box.
-    #l = p_fancy.get_path().vertices
-    #ax.plot(l[:,0], l[:,1], ".")
+    # l = p_fancy.get_path().vertices
+    # ax.plot(l[:,0], l[:,1], ".")
 
     draw_bbox(ax, bb)
 
@@ -122,8 +122,8 @@ def test3(ax):
             size=10, transform=ax.transAxes)
 
     # draws control points for the fancy box.
-    #l = p_fancy.get_path().vertices
-    #ax.plot(l[:,0], l[:,1], ".")
+    # l = p_fancy.get_path().vertices
+    # ax.plot(l[:,0], l[:,1], ".")
 
     draw_bbox(ax, bb)
 
@@ -192,4 +192,5 @@ def test_all():
     plt.draw()
     plt.show()
 
+
 test_all()
diff --git a/tutorials/01_introductory/sample_plots.py b/tutorials/01_introductory/sample_plots.py
@@ -14,8 +14,8 @@
 Here's how to create a line plot with  text labels using
 :func:`~matplotlib.pyplot.plot`.
 
-.. figure:: ../../gallery/pylab_examples/images/sphx_glr_simple_plot_001.png
-   :target: ../../gallery/pylab_examples/simple_plot.html
+.. figure:: ../../gallery/lines_bars_and_markers/images/sphx_glr_simple_plot_001.png
+   :target: ../../gallery/lines_bars_and_markers/simple_plot.html
    :align: center
    :scale: 50
 
@@ -120,8 +120,8 @@
 accurate  8-spline approximation to elliptical arcs (see
 :class:`~matplotlib.patches.Arc`), which are insensitive to zoom level.
 
-.. figure:: ../../gallery/pylab_examples/images/sphx_glr_ellipse_demo_001.png
-   :target: ../../gallery/pylab_examples/ellipse_demo.html
+.. figure:: ../../gallery/shapes_and_collections/images/sphx_glr_ellipse_demo_001.png
+   :target: ../../gallery/shapes_and_collections/ellipse_demo.html
    :align: center
    :scale: 50
 
@@ -174,8 +174,8 @@
 The :func:`~matplotlib.pyplot.table` command adds a text table
 to an axes.
 
-.. figure:: ../../gallery/pylab_examples/images/sphx_glr_table_demo_001.png
-   :target: ../../gallery/pylab_examples/table_demo.html
+.. figure:: ../../gallery/misc/images/sphx_glr_table_demo_001.png
+   :target: ../../gallery/misc/table_demo.html
    :align: center
    :scale: 50
 
@@ -265,8 +265,8 @@
 :func:`~matplotlib.pyplot.loglog` functions simplify the creation of
 logarithmic plots.
 
-.. figure:: ../../gallery/pylab_examples/images/sphx_glr_log_demo_001.png
-   :target: ../../gallery/pylab_examples/log_demo.html
+.. figure:: ../../gallery/scales/images/sphx_glr_log_demo_001.png
+   :target: ../../gallery/scales/log_demo.html
    :align: center
    :scale: 50
 
@@ -282,8 +282,8 @@
 
 The :func:`~matplotlib.pyplot.polar` command generates polar plots.
 
-.. figure:: ../../gallery/pylab_examples/images/sphx_glr_polar_demo_001.png
-   :target: ../../gallery/pylab_examples/polar_demo.html
+.. figure:: ../../gallery/pie_and_polar_charts/images/sphx_glr_polar_demo_001.png
+   :target: ../../gallery/pie_and_polar_charts/polar_demo.html
    :align: center
    :scale: 50
 
diff --git a/tutorials/text/annotations.py b/tutorials/text/annotations.py
@@ -158,8 +158,8 @@
   Square       ``square``       pad=0.3
   ==========   ==============   ==========================
 
-.. figure:: ../../gallery/pylab_examples/images/sphx_glr_fancybox_demo_001.png
-   :target: ../../gallery/pylab_examples/fancybox_demo.html
+.. figure:: ../../gallery/shapes_and_collections/images/sphx_glr_fancybox_demo_001.png
+   :target: ../../gallery/shapes_and_collections/fancybox_demo.html
    :align: center
    :scale: 50
 
