Deprecate Axes3D.w_{x,y,z}axis in favor of .{x,y,z}axis.

anntzer · anntzer · commit 6e13a104f660 · 2018-06-07T07:34:25.000+02:00
diff --git a/doc/api/next_api_changes/2018-02-15-AL-deprecations.rst b/doc/api/next_api_changes/2018-02-15-AL-deprecations.rst
@@ -11,6 +11,8 @@ The following modules are deprecated:
 The following classes, methods, functions, and attributes are deprecated:
 
 - ``afm.parse_afm``,
+- ``axes3d.Axes3D.w_xaxis``, ``.w_yaxis``, and ``.w_zaxis`` (use ``.xaxis``,
+  ``.yaxis``, and ``.zaxis`` instead),
 - ``backend_pgf.get_texcommand``,
 - ``backend_ps.get_bbox``,
 - ``backend_qt5.error_msg_qt``, ``backend_qt5.exception_handler``,
diff --git a/examples/mplot3d/surface3d_3.py b/examples/mplot3d/surface3d_3.py
@@ -38,6 +38,6 @@
 
 # Customize the z axis.
 ax.set_zlim(-1, 1)
-ax.w_zaxis.set_major_locator(LinearLocator(6))
+ax.zaxis.set_major_locator(LinearLocator(6))
 
 plt.show()
diff --git a/examples/pyplots/whats_new_1_subplot3d.py b/examples/pyplots/whats_new_1_subplot3d.py
@@ -23,8 +23,8 @@
         linewidth=0, antialiased=False)
 ax.set_zlim3d(-1.01, 1.01)
 
-#ax.w_zaxis.set_major_locator(LinearLocator(10))
-#ax.w_zaxis.set_major_formatter(FormatStrFormatter('%.03f'))
+#ax.zaxis.set_major_locator(LinearLocator(10))
+#ax.zaxis.set_major_formatter(FormatStrFormatter('%.03f'))
 
 fig.colorbar(surf, shrink=0.5, aspect=5)
 
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -192,19 +192,31 @@ def set_top_view(self):
 
     def _init_axis(self):
         '''Init 3D axes; overrides creation of regular X/Y axes'''
-        self.w_xaxis = axis3d.XAxis('x', self.xy_viewLim.intervalx,
-                                    self.xy_dataLim.intervalx, self)
-        self.xaxis = self.w_xaxis
-        self.w_yaxis = axis3d.YAxis('y', self.xy_viewLim.intervaly,
-                                    self.xy_dataLim.intervaly, self)
-        self.yaxis = self.w_yaxis
-        self.w_zaxis = axis3d.ZAxis('z', self.zz_viewLim.intervalx,
-                                    self.zz_dataLim.intervalx, self)
-        self.zaxis = self.w_zaxis
+        self.xaxis = axis3d.XAxis('x', self.xy_viewLim.intervalx,
+                                  self.xy_dataLim.intervalx, self)
+        self.yaxis = axis3d.YAxis('y', self.xy_viewLim.intervaly,
+                                  self.xy_dataLim.intervaly, self)
+        self.zaxis = axis3d.ZAxis('z', self.zz_viewLim.intervalx,
+                                  self.zz_dataLim.intervalx, self)
 
         for ax in self.xaxis, self.yaxis, self.zaxis:
             ax.init3d()
 
+    @property
+    @cbook.deprecated("3.0", alternative="xaxis", removal=False)
+    def w_xaxis(self):
+        return self.xaxis
+
+    @property
+    @cbook.deprecated("3.0", alternative="yaxis", removal=False)
+    def w_yaxis(self):
+        return self.yaxis
+
+    @property
+    @cbook.deprecated("3.0", alternative="zaxis", removal=False)
+    def w_zaxis(self):
+        return self.zaxis
+
     def get_children(self):
         return [self.zaxis] + super().get_children()
 
