add tim's suggestion

saranti · saranti · commit c6932a54da42 · 2024-04-20T17:16:58.000+10:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -8350,10 +8350,10 @@ def matshow(self, Z, **kwargs):
 
     @_api.make_keyword_only("3.9", "vert")
     @_preprocess_data(replace_names=["dataset"])
-    def violinplot(self, dataset, positions=None, vert=None, widths=0.5,
-                   showmeans=False, showextrema=True, showmedians=False,
-                   quantiles=None, points=100, bw_method=None, side='both',
-                   orientation=None):
+    def violinplot(self, dataset, positions=None, orientation='vertical',
+                   vert=None, widths=0.5, showmeans=False, showextrema=True,
+                   showmedians=False, quantiles=None, points=100,
+                   bw_method=None, side='both',):
         """
         Make a violin plot.
 
@@ -8371,6 +8371,12 @@ def violinplot(self, dataset, positions=None, vert=None, widths=0.5,
             The positions of the violins; i.e. coordinates on the x-axis for
             vertical violins (or y-axis for horizontal violins).
 
+        orientation : {'vertical', 'horizontal'}, default: 'vertical'
+            If 'horizontal', plots the violins horizontally.
+            Otherwise, plots the violins vertically.
+
+            .. versionadded:: 3.10
+
         vert : bool, default: True.
             .. deprecated:: 3.10
                 Use *orientation* instead.
@@ -8414,12 +8420,6 @@ def violinplot(self, dataset, positions=None, vert=None, widths=0.5,
             'both' plots standard violins. 'low'/'high' only
             plots the side below/above the positions value.
 
-        orientation : {'vertical', 'horizontal'}, default: 'vertical'
-            If 'horizontal', plots the violins horizontally.
-            Otherwise, plots the violins vertically.
-
-            .. versionadded:: 3.10
-
         data : indexable object, optional
             DATA_PARAMETER_PLACEHOLDER
 
@@ -8475,9 +8475,9 @@ def _kde_method(X, coords):
                            showmedians=showmedians, side=side)
 
     @_api.make_keyword_only("3.9", "vert")
-    def violin(self, vpstats, positions=None, vert=None, widths=0.5,
-               showmeans=False, showextrema=True, showmedians=False, side='both',
-               orientation=None):
+    def violin(self, vpstats, positions=None, orientation=None,
+               vert=None, widths=0.5, showmeans=False, showextrema=True,
+               showmedians=False, side='both'):
         """
         Draw a violin plot from pre-computed statistics.
 
@@ -8515,6 +8515,12 @@ def violin(self, vpstats, positions=None, vert=None, widths=0.5,
             The positions of the violins; i.e. coordinates on the x-axis for
             vertical violins (or y-axis for horizontal violins).
 
+        orientation : {'vertical', 'horizontal'}, default: 'vertical'
+            If 'horizontal', plots the violins horizontally.
+            Otherwise, plots the violins vertically.
+
+            .. versionadded:: 3.10
+
         vert : bool, default: True.
             .. deprecated:: 3.10
                 Use *orientation* instead.
@@ -8543,12 +8549,6 @@ def violin(self, vpstats, positions=None, vert=None, widths=0.5,
             'both' plots standard violins. 'low'/'high' only
             plots the side below/above the positions value.
 
-        orientation : {'vertical', 'horizontal'}, default: 'vertical'
-            If 'horizontal', plots the violins horizontally.
-            Otherwise, plots the violins vertically.
-
-            .. versionadded:: 3.10
-
         Returns
         -------
         dict
@@ -8599,23 +8599,17 @@ def violin(self, vpstats, positions=None, vert=None, widths=0.5,
         datashape_message = ("List of violinplot statistics and `{0}` "
                              "values must have the same length")
 
+        # vert and orientation parameters are linked until vert's
+        # deprecation period expires. If both are selected,
+        # vert takes precedence.
         if vert is not None:
             _api.warn_deprecated(
                 "3.10",
                 name="vert: bool",
                 alternative="orientation: {'vertical', 'horizontal'}"
-            )
-
-        # vert and orientation parameters are linked until vert's
-        # deprecation period expires. If both are selected,
-        # vert takes precedence.
-        if vert or vert is None and orientation is None:
-            orientation = 'vertical'
-        elif vert is False:
-            orientation = 'horizontal'
-
-        if orientation is not None:
-            _api.check_in_list(['horizontal', 'vertical'], orientation=orientation)
+                )
+            orientation = 'vertical' if vert else 'horizontal'
+        _api.check_in_list(['horizontal', 'vertical'], orientation=orientation)
 
         # Validate positions
         if positions is None:
diff --git a/lib/matplotlib/axes/_axes.pyi b/lib/matplotlib/axes/_axes.pyi
@@ -739,6 +739,7 @@ class Axes(_AxesBase):
         dataset: ArrayLike | Sequence[ArrayLike],
         positions: ArrayLike | None = ...,
         *,
+        orientation: Literal["vertical", "horizontal"] | None = ...,
         vert: bool | None = ...,
         widths: float | ArrayLike = ...,
         showmeans: bool = ...,
@@ -751,21 +752,20 @@ class Axes(_AxesBase):
         | Callable[[GaussianKDE], float]
         | None = ...,
         side: Literal["both", "low", "high"] = ...,
-        orientation: Literal["vertical", "horizontal"] | None = ...,
         data=...,
     ) -> dict[str, Collection]: ...
     def violin(
         self,
         vpstats: Sequence[dict[str, Any]],
         positions: ArrayLike | None = ...,
         *,
+        orientation: Literal["vertical", "horizontal"] | None = ...,
         vert: bool | None = ...,
         widths: float | ArrayLike = ...,
         showmeans: bool = ...,
         showextrema: bool = ...,
         showmedians: bool = ...,
         side: Literal["both", "low", "high"] = ...,
-        orientation: Literal["vertical", "horizontal"] | None = ...,
     ) -> dict[str, Collection]: ...
 
     table = mtable.table
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -4142,6 +4142,7 @@ def triplot(*args, **kwargs):
 def violinplot(
     dataset: ArrayLike | Sequence[ArrayLike],
     positions: ArrayLike | None = None,
+    orientation: Literal["vertical", "horizontal"] | None = "vertical",
     vert: bool | None = None,
     widths: float | ArrayLike = 0.5,
     showmeans: bool = False,
@@ -4154,13 +4155,13 @@ def violinplot(
     | Callable[[GaussianKDE], float]
     | None = None,
     side: Literal["both", "low", "high"] = "both",
-    orientation: Literal["vertical", "horizontal"] | None = None,
     *,
     data=None,
 ) -> dict[str, Collection]:
     return gca().violinplot(
         dataset,
         positions=positions,
+        orientation=orientation,
         vert=vert,
         widths=widths,
         showmeans=showmeans,
@@ -4170,7 +4171,6 @@ def violinplot(
         points=points,
         bw_method=bw_method,
         side=side,
-        orientation=orientation,
         **({"data": data} if data is not None else {}),
     )
 
