From 6ba7a77b868869a31b26538a9c6dd0d81d71fd8e Mon Sep 17 00:00:00 2001
From: gfyoung <gfyoung17@gmail.com>
Date: Sat, 2 Jul 2016 18:22:49 -0400
Subject: [PATCH] Removed unnecessary params in cum_func

Closes gh-13541.
---
 pandas/compat/numpy/function.py | 20 ++++++++++++++++++--
 pandas/core/generic.py          |  4 ++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pandas/compat/numpy/function.py b/pandas/compat/numpy/function.py
index 274761f5d0b9c..15bf6d31b7109 100644
--- a/pandas/compat/numpy/function.py
+++ b/pandas/compat/numpy/function.py
@@ -21,7 +21,7 @@
 from numpy import ndarray
 from pandas.util.validators import (validate_args, validate_kwargs,
                                     validate_args_and_kwargs)
-from pandas.core.common import is_integer, UnsupportedFunctionCall
+from pandas.core.common import is_bool, is_integer, UnsupportedFunctionCall
 from pandas.compat import OrderedDict
 
 
@@ -148,10 +148,26 @@ def validate_clip_with_axis(axis, args, kwargs):
 CUM_FUNC_DEFAULTS = OrderedDict()
 CUM_FUNC_DEFAULTS['dtype'] = None
 CUM_FUNC_DEFAULTS['out'] = None
-validate_cum_func = CompatValidator(CUM_FUNC_DEFAULTS, method='kwargs')
+validate_cum_func = CompatValidator(CUM_FUNC_DEFAULTS, method='both',
+                                    max_fname_arg_count=1)
 validate_cumsum = CompatValidator(CUM_FUNC_DEFAULTS, fname='cumsum',
                                   method='both', max_fname_arg_count=1)
 
+
+def validate_cum_func_with_skipna(skipna, args, kwargs, name):
+    """
+    If this function is called via the 'numpy' library, the third
+    parameter in its signature is 'dtype', which takes either a
+    'numpy' dtype or 'None', so check if the 'skipna' parameter is
+    a boolean or not
+    """
+    if not is_bool(skipna):
+        args = (skipna,) + args
+        skipna = True
+
+    validate_cum_func(args, kwargs, fname=name)
+    return skipna
+
 LOGICAL_FUNC_DEFAULTS = dict(out=None)
 validate_logical_func = CompatValidator(LOGICAL_FUNC_DEFAULTS, method='kwargs')
 
diff --git a/pandas/core/generic.py b/pandas/core/generic.py
index 6b25cf6ed71a1..cc5c45158bf4f 100644
--- a/pandas/core/generic.py
+++ b/pandas/core/generic.py
@@ -5484,8 +5484,8 @@ def _make_cum_function(cls, name, name1, name2, axis_descr, desc, accum_func,
                   axis_descr=axis_descr)
     @Appender("Return cumulative {0} over requested axis.".format(name) +
               _cnum_doc)
-    def cum_func(self, axis=None, dtype=None, out=None, skipna=True, **kwargs):
-        nv.validate_cum_func(tuple(), kwargs, fname=name)
+    def cum_func(self, axis=None, skipna=True, *args, **kwargs):
+        skipna = nv.validate_cum_func_with_skipna(skipna, args, kwargs, name)
         if axis is None:
             axis = self._stat_axis_number
         else: