matplotlib
diff --git a/‎lib/mpl_toolkits/mplot3d/axes3d.py‎
Lines changed: 2 additions & 18 deletions b/‎lib/mpl_toolkits/mplot3d/axes3d.py‎
Lines changed: 2 additions & 18 deletions
diff --git a/‎lib/mpl_toolkits/tests/baseline_images/test_mplot3d/contour3d_extend3d.png‎
62.7 KB b/‎lib/mpl_toolkits/tests/baseline_images/test_mplot3d/contour3d_extend3d.png‎
62.7 KB
diff --git a/‎lib/mpl_toolkits/tests/test_mplot3d.py‎
Lines changed: 60 additions & 0 deletions b/‎lib/mpl_toolkits/tests/test_mplot3d.py‎
Lines changed: 60 additions & 0 deletions
@@ -393,7 +393,6 @@ def draw(self, renderer):
 
         # draw the background patch
         self.patch.draw(renderer)
-        self._frameon = False
 
         # first, set the aspect
         # this is duplicated from `axes._base._AxesBase.draw`
@@ -489,7 +488,7 @@ def margins(self, *margins, x=None, y=None, z=None, tight=True):
         applies to 3D Axes, it also takes a *z* argument, and returns
         ``(xmargin, ymargin, zmargin)``.
         """
-        if margins and x is not None and y is not None and z is not None:
+        if margins and (x is not None or y is not None or z is not None):
             raise TypeError('Cannot pass both positional and keyword '
                             'arguments for x, y, and/or z.')
         elif len(margins) == 1:
@@ -816,7 +815,7 @@ def set_proj_type(self, proj_type, focal_length=None):
                 raise ValueError(f"focal_length = {focal_length} must be "
                                  "greater than 0")
             self._focal_length = focal_length
-        elif proj_type == 'ortho':
+        else:  # 'ortho'
             if focal_length not in (None, np.inf):
                 raise ValueError(f"focal_length = {focal_length} must be "
                                  f"None for proj_type = {proj_type}")
@@ -1132,21 +1131,6 @@ def get_zlabel(self):
 
     # Axes rectangle characteristics
 
-    def get_frame_on(self):
-        """Get whether the 3D axes panels are drawn."""
-        return self._frameon
-
-    def set_frame_on(self, b):
-        """
-        Set whether the 3D axes panels are drawn.
-
-        Parameters
-        ----------
-        b : bool
-        """
-        self._frameon = bool(b)
-        self.stale = True
-
     @_api.rename_parameter("3.5", "b", "visible")
     def grid(self, visible=True, **kwargs):
         """
 
@@ -131,6 +131,17 @@ def test_contour3d():
     ax.set_zlim(-100, 100)
 
 
+@mpl3d_image_comparison(['contour3d_extend3d.png'])
+def test_contour3d_extend3d():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    X, Y, Z = axes3d.get_test_data(0.05)
+    ax.contour(X, Y, Z, zdir='z', offset=-100, cmap=cm.coolwarm, extend3d=True)
+    ax.set_xlim(-30, 30)
+    ax.set_ylim(-20, 40)
+    ax.set_zlim(-80, 80)
+
+
 @mpl3d_image_comparison(['contourf3d.png'])
 def test_contourf3d():
     fig = plt.figure()
@@ -1029,6 +1040,9 @@ def test_autoscale():
     ax.set_autoscalez_on(True)
     ax.plot([0, 2], [0, 2], [0, 2])
     assert ax.get_w_lims() == (0, 1, -.1, 1.1, -.4, 2.4)
+    ax.autoscale(axis='x')
+    ax.plot([0, 2], [0, 2], [0, 2])
+    assert ax.get_w_lims() == (0, 2, -.1, 1.1, -.4, 2.4)
 
 
 @pytest.mark.parametrize('axis', ('x', 'y', 'z'))
@@ -1643,6 +1657,52 @@ def test_computed_zorder():
         ax.axis('off')
 
 
+def test_format_coord():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    x = np.arange(10)
+    ax.plot(x, np.sin(x))
+    fig.canvas.draw()
+    assert ax.format_coord(0, 0) == 'x=1.8066, y=1.0367, z=−0.0553'
+    # Modify parameters
+    ax.view_init(roll=30, vertical_axis="y")
+    fig.canvas.draw()
+    assert ax.format_coord(0, 0) == 'x=9.1651, y=−0.9215, z=−0.0359'
+    # Reset parameters
+    ax.view_init()
+    fig.canvas.draw()
+    assert ax.format_coord(0, 0) == 'x=1.8066, y=1.0367, z=−0.0553'
+
+
+def test_get_axis_position():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    x = np.arange(10)
+    ax.plot(x, np.sin(x))
+    fig.canvas.draw()
+    assert ax.get_axis_position() == (False, True, False)
+
+
+def test_margins():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    ax.margins(0.2)
+    assert ax.margins() == (0.2, 0.2, 0.2)
+    ax.margins(0.1, 0.2, 0.3)
+    assert ax.margins() == (0.1, 0.2, 0.3)
+    ax.margins(x=0)
+    assert ax.margins() == (0, 0.2, 0.3)
+
+
+def test_margins_errors():
+    fig = plt.figure()
+    ax = fig.add_subplot(projection='3d')
+    with pytest.raises(TypeError, match="Cannot pass"):
+        ax.margins(0.2, x=0.4)
+    with pytest.raises(TypeError, match="Must pass"):
+        ax.margins(0.2, 0.4)
+
+
 @image_comparison(baseline_images=['scatter_spiral.png'],
                   remove_text=True,
                   style='default')