Merge pull request #18419 from anntzer/ungcakw

jklymak · web-flow · commit 2c265edcd8e0 · 2020-09-06T17:23:59.000-07:00
Avoid demo'ing passing kwargs to gca().
diff --git a/examples/mplot3d/2dcollections3d.py b/examples/mplot3d/2dcollections3d.py
@@ -10,8 +10,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 
 # Plot a sin curve using the x and y axes.
 x = np.linspace(0, 1, 100)
diff --git a/examples/mplot3d/contour3d.py b/examples/mplot3d/contour3d.py
@@ -11,13 +11,10 @@
 import matplotlib.pyplot as plt
 from matplotlib import cm
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 X, Y, Z = axes3d.get_test_data(0.05)
 
-# Plot contour curves
-cset = ax.contour(X, Y, Z, cmap=cm.coolwarm)
-
+cset = ax.contour(X, Y, Z, cmap=cm.coolwarm)  # Plot contour curves
 ax.clabel(cset, fontsize=9, inline=True)
 
 plt.show()
diff --git a/examples/mplot3d/contour3d_2.py b/examples/mplot3d/contour3d_2.py
@@ -11,8 +11,7 @@
 import matplotlib.pyplot as plt
 from matplotlib import cm
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 X, Y, Z = axes3d.get_test_data(0.05)
 
 cset = ax.contour(X, Y, Z, extend3d=True, cmap=cm.coolwarm)
diff --git a/examples/mplot3d/contour3d_3.py b/examples/mplot3d/contour3d_3.py
@@ -13,8 +13,7 @@
 import matplotlib.pyplot as plt
 from matplotlib import cm
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 X, Y, Z = axes3d.get_test_data(0.05)
 
 # Plot the 3D surface
diff --git a/examples/mplot3d/contourf3d.py b/examples/mplot3d/contourf3d.py
@@ -14,8 +14,7 @@
 import matplotlib.pyplot as plt
 from matplotlib import cm
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 X, Y, Z = axes3d.get_test_data(0.05)
 
 cset = ax.contourf(X, Y, Z, cmap=cm.coolwarm)
diff --git a/examples/mplot3d/contourf3d_2.py b/examples/mplot3d/contourf3d_2.py
@@ -13,8 +13,7 @@
 import matplotlib.pyplot as plt
 from matplotlib import cm
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 X, Y, Z = axes3d.get_test_data(0.05)
 
 # Plot the 3D surface
diff --git a/examples/mplot3d/errorbar3d.py b/examples/mplot3d/errorbar3d.py
@@ -9,8 +9,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 
 # setting up a parametric curve
 t = np.arange(0, 2*np.pi+.1, 0.01)
diff --git a/examples/mplot3d/lines3d.py b/examples/mplot3d/lines3d.py
@@ -10,10 +10,7 @@
 import matplotlib.pyplot as plt
 
 
-plt.rcParams['legend.fontsize'] = 10
-
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 
 # Prepare arrays x, y, z
 theta = np.linspace(-4 * np.pi, 4 * np.pi, 100)
diff --git a/examples/mplot3d/lorenz_attractor.py b/examples/mplot3d/lorenz_attractor.py
@@ -54,8 +54,7 @@ def lorenz(x, y, z, s=10, r=28, b=2.667):
 
 
 # Plot
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 
 ax.plot(xs, ys, zs, lw=0.5)
 ax.set_xlabel("X Axis")
diff --git a/examples/mplot3d/offset.py b/examples/mplot3d/offset.py
@@ -17,8 +17,7 @@
 import numpy as np
 
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 
 X, Y = np.mgrid[0:6*np.pi:0.25, 0:4*np.pi:0.25]
 Z = np.sqrt(np.abs(np.cos(X) + np.cos(Y)))
diff --git a/examples/mplot3d/polys3d.py b/examples/mplot3d/polys3d.py
@@ -24,8 +24,7 @@ def polygon_under_graph(xlist, ylist):
     return [(xlist[0], 0.), *zip(xlist, ylist), (xlist[-1], 0.)]
 
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 
 # Make verts a list such that verts[i] is a list of (x, y) pairs defining
 # polygon i.
diff --git a/examples/mplot3d/quiver3d.py b/examples/mplot3d/quiver3d.py
@@ -9,8 +9,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 
 # Make the grid
 x, y, z = np.meshgrid(np.arange(-0.8, 1, 0.2),
diff --git a/examples/mplot3d/surface3d_3.py b/examples/mplot3d/surface3d_3.py
@@ -11,8 +11,7 @@
 import numpy as np
 
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 
 # Make data.
 X = np.arange(-5, 5, 0.25)
diff --git a/examples/mplot3d/text3d.py b/examples/mplot3d/text3d.py
@@ -7,20 +7,17 @@
 
 Functionality shown:
 
-    - Using the text function with three types of 'zdir' values: None, an axis
-      name (ex. 'x'), or a direction tuple (ex. (1, 1, 0)).
-    - Using the text function with the color keyword.
-
-    - Using the text2D function to place text on a fixed position on the ax
-      object.
-
+- Using the text function with three types of 'zdir' values: None, an axis
+  name (ex. 'x'), or a direction tuple (ex. (1, 1, 0)).
+- Using the text function with the color keyword.
+- Using the text2D function to place text on a fixed position on the ax
+  object.
 """
 
 import matplotlib.pyplot as plt
 
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 
 # Demo 1: zdir
 zdirs = (None, 'x', 'y', 'z', (1, 1, 0), (1, 1, 1))
diff --git a/examples/mplot3d/tricontour3d.py b/examples/mplot3d/tricontour3d.py
@@ -35,8 +35,7 @@
                          y[triang.triangles].mean(axis=1))
                 < min_radius)
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 ax.tricontour(triang, z, cmap=plt.cm.CMRmap)
 
 # Customize the view angle so it's easier to understand the plot.
diff --git a/examples/mplot3d/tricontourf3d.py b/examples/mplot3d/tricontourf3d.py
@@ -36,8 +36,7 @@
                          y[triang.triangles].mean(axis=1))
                 < min_radius)
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 ax.tricontourf(triang, z, cmap=plt.cm.CMRmap)
 
 # Customize the view angle so it's easier to understand the plot.
diff --git a/examples/mplot3d/trisurf3d.py b/examples/mplot3d/trisurf3d.py
@@ -26,8 +26,7 @@
 # Compute z to make the pringle surface.
 z = np.sin(-x*y)
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 
 ax.plot_trisurf(x, y, z, linewidth=0.2, antialiased=True)
 
diff --git a/examples/mplot3d/voxels.py b/examples/mplot3d/voxels.py
@@ -29,8 +29,7 @@
 colors[cube2] = 'green'
 
 # and plot everything
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 ax.voxels(voxels, facecolors=colors, edgecolor='k')
 
 plt.show()
diff --git a/examples/mplot3d/voxels_numpy_logo.py b/examples/mplot3d/voxels_numpy_logo.py
@@ -5,6 +5,7 @@
 
 Demonstrates using `.Axes3D.voxels` with uneven coordinates.
 """
+
 import matplotlib.pyplot as plt
 import numpy as np
 
@@ -39,8 +40,7 @@ def explode(data):
 y[:, 1::2, :] += 0.95
 z[:, :, 1::2] += 0.95
 
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 ax.voxels(x, y, z, filled_2, facecolors=fcolors_2, edgecolors=ecolors_2)
 
 plt.show()
diff --git a/examples/mplot3d/voxels_rgb.py b/examples/mplot3d/voxels_rgb.py
@@ -33,8 +33,7 @@ def midpoints(x):
 colors[..., 2] = bc
 
 # and plot everything
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 ax.voxels(r, g, b, sphere,
           facecolors=colors,
           edgecolors=np.clip(2*colors - 0.5, 0, 1),  # brighter
diff --git a/examples/mplot3d/voxels_torus.py b/examples/mplot3d/voxels_torus.py
@@ -36,8 +36,7 @@ def midpoints(x):
 colors = matplotlib.colors.hsv_to_rgb(hsv)
 
 # and plot everything
-fig = plt.figure()
-ax = fig.gca(projection='3d')
+ax = plt.figure().add_subplot(projection='3d')
 ax.voxels(x, y, z, sphere,
           facecolors=colors,
           edgecolors=np.clip(2*colors - 0.5, 0, 1),  # brighter
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
