DOC: Update args and kwargs to same line, other small changes

Put args and kwargs back on the same line, since that's how the documentation should be. The validation script needs to be changed to catch this.
pandas-dev · WillAyd · Nov 8, 2019 · Oct 1, 2019 · Oct 1, 2019 · Oct 2, 2019
commit 532b53cc800b571fe275a9b4e1d371d021e43e31
diff --git a/pandas/core/frame.py b/pandas/core/frame.py
@@ -2610,12 +2610,9 @@ def transpose(self, *args, **kwargs):
 
         Parameters
         ----------
-        *args
-            Additional arguments have no effect but might be accepted for
-            compatibility with numpy.
-        **kwargs
-            Additional keywords have no effect but might be accepted for
-            compatibility with numpy.
+        *args, **kwargs
+            Additional arguments and keywords have no effect but might be 
+            accepted for compatibility with numpy.
 
         Returns
         -------
@@ -3237,7 +3234,7 @@ def eval(self, expr, inplace=False, **kwargs):
             If the expression contains an assignment, whether to perform the
             operation inplace and mutate the existing DataFrame. Otherwise,
             a new DataFrame is returned.
-        **kwargs : dict
+        **kwargs
             See the documentation for :func:`eval` for complete details
             on the keyword arguments accepted by
             :meth:`~pandas.DataFrame.query`.
@@ -5205,9 +5202,9 @@ def swaplevel(self, i=-2, j=-1, axis=0):
 
         Parameters
         ----------
-        i : int, str (can be mixed)
+        i : int or str
             Level of first index to be swapped. Can pass level name as string.
-        j : int, str (can be mixed)
+        j : int or str
             Level of second index to be swapped. Can pass level name as string.
 
         Returns

diff --git a/pandas/core/series.py b/pandas/core/series.py
@@ -2082,12 +2082,9 @@ def idxmin(self, axis=0, skipna=True, *args, **kwargs):
         skipna : bool, default True
             Exclude NA/null values. If the entire Series is NA, the result
             will be NA.
-        *args
-            Additional arguments have no effect but might be accepted
-            for compatability with NumPy
-        **kwargs
-            Additional keywords have no effect but might be accepted
-            for compatibility with NumPy.
+        *args, **kwargs
+            Additional arguments and keywords have no effect but might be
+            accepted for compatability with NumPy.
 
         Returns
         -------
@@ -2155,13 +2152,10 @@ def idxmax(self, axis=0, skipna=True, *args, **kwargs):
         skipna : bool, default True
             Exclude NA/null values. If the entire Series is NA, the result
             will be NA.
-        *args
-            Additional arguments have no effect but might be accepted
-            for compatibility with NumPy.
-        **kwargs
-            Additional keywords have no effect but might be accepted
-            for compatibility with NumPy.
-
+        *args, **kwargs
+            Additional arguments and keywords have no effect but might be
+            accepted for compatibility with NumPy.
+
         Returns
         -------
         Index

diff --git a/pandas/core/window/ewm.py b/pandas/core/window/ewm.py
@@ -17,10 +17,8 @@
         ----------
         bias : bool, default False
             Use a standard estimation bias correction.
-        *args
-            Arguments to be passed into func.
-        **kwargs
-            Keyword arguments to be passed into func.
+        *args, **kwargs
+            Arguments and keyword arguments to be passed into func.
 """
 
 
@@ -365,10 +363,9 @@ def corr(self, other=None, pairwise=None, **kwargs):
             output will be a MultiIndex DataFrame in the case of DataFrame
             inputs. In the case of missing elements, only complete pairwise
             observations will be used.
-        **kwargs : dict of {str : Any}
+        **kwargs
            Keyword arguments to be passed into func.
         """
-
         if other is None:
             other = self._selected_obj
             # only default unset

diff --git a/pandas/core/window/rolling.py b/pandas/core/window/rolling.py
@@ -495,10 +495,7 @@ def aggregate(self, func, *args, **kwargs):
 
     Parameters
     ----------
-    *args
-        For compatibility with other %(name)s methods. Has no effect
-        on the computed value.
-    **kwargs
+    *args, **kwargs
         For compatibility with other %(name)s methods. Has no effect
         on the computed value.
 
@@ -1021,9 +1018,7 @@ def count(self):
         not passed. In the future `raw` will default to False.
 
         .. versionadded:: 0.23.0
-    args : tuple of Any
-        Arguments and keyword arguments to be passed into func.
-    kwargs : dict of {str : any}
+    *args, **kwargs
         Arguments and keyword arguments to be passed into func.
 
     Returns
@@ -1089,9 +1084,7 @@ def sum(self, *args, **kwargs):
 
     Parameters
     ----------
-    *args
-        Arguments and keyword arguments to be passed into func.
-    **kwargs
+    *args, **kwargs
         Arguments and keyword arguments to be passed into func.
     """
     )
@@ -1197,9 +1190,7 @@ def median(self, **kwargs):
     ddof : int, default 1
         Delta Degrees of Freedom.  The divisor used in calculations
         is ``N - ddof``, where ``N`` represents the number of elements.
-    *args
-        For NumPy compatibility. No additional arguments are used.
-    **kwargs
+    *args, **kwargs
         For NumPy compatibility. No additional arguments are used.
 
     Returns
@@ -1274,9 +1265,7 @@ def f(arg, *args, **kwargs):
     ddof : int, default 1
         Delta Degrees of Freedom.  The divisor used in calculations
         is ``N - ddof``, where ``N`` represents the number of elements.
-    *args
-        For NumPy compatibility. No additional arguments are used.
-    **kwargs
+    *args, **kwargs
         For NumPy compatibility. No additional arguments are used.
 
     Returns

diff --git a/pandas/plotting/_misc.py b/pandas/plotting/_misc.py
@@ -398,7 +398,8 @@ def lag_plot(series, lag=1, ax=None, **kwds):
     series : Time series
     lag : lag of the scatter plot, default 1
     ax : Matplotlib axis object, optional
-    **kwds : Matplotlib scatter method keyword arguments, optional
+    **kwds
+        Matplotlib scatter method keyword arguments, optional
 
     Returns
     -------