Do for panel too

pandas-dev · jorisvandenbossche · Oct 27, 2017 · Oct 24, 2017 · Oct 24, 2017 · Oct 24, 2017
commit 7c419e0fa6a9f74dd25697e3413067a0310798a3
diff --git a/pandas/core/frame.py b/pandas/core/frame.py
@@ -3025,57 +3025,6 @@ def shift(self, periods=1, freq=None, axis=0):
         return super(DataFrame, self).shift(periods=periods, freq=freq,
                                             axis=axis)
 
-    def _validate_axis_style_args(self, args, kwargs, arg_name, method_name):
-        out = {}
-        # Goal: fill out with index/columns-style arguments
-            # like out = {'index': foo, 'columns': bar}
-        # Start by validaing for consistency
-        if 'axis' in kwargs and any(x in kwargs for x in self._AXIS_NUMBERS):
-            msg = "Cannot specify both 'axis' and any of 'columns' or 'index'."
-            raise TypeError(msg)
-
-        # Start with explicit values provided by the user...
-        if arg_name in kwargs:
-            if args:
-                msg = "{} got multiple values for argument '{}'".format(
-                    method_name, arg_name)
-                raise TypeError(msg)
-            axis = self._get_axis_name(kwargs.get('axis', 0))
-            out[axis] = kwargs[arg_name]
-
-        # fill in axes
-        for k, v in kwargs.items():
-            try:
-                ax = self._get_axis_name(k)
-            except ValueError:
-                pass
-            else:
-                out[ax] = v
-
-        # All user-provided kwargs have been handled now.
-        # Now we supplement with positional arguments, raising when there's
-        # ambiguity
-
-        if len(args) == 0:
-            pass  # validate later
-        elif len(args) == 1:
-            axis = self._get_axis_name(kwargs.get('axis', 0))
-            out[axis] = args[0]
-        elif len(args) == 2:
-            if 'axis' in kwargs:
-                msg = "Cannot specify both {} and any of 'index' or 'columns'"
-                raise TypeError(msg.format(arg_name))
-            msg = ("Intepreting call\n\t'.{method_name}(a, b)' as "
-                   "\n\t'.{method_name}(index=a, columns=b)'.\nUse named "
-                   "arguments to remove any ambiguity.")
-            warnings.warn(msg.format(method_name=method_name,), stacklevel=3)
-            out[self._AXIS_NAMES[0]] = args[0]
-            out[self._AXIS_NAMES[1]] = args[1]
-        else:
-            msg = "Cannot specify all of '{}', 'index', 'columns'."
-            raise TypeError(msg.format(arg_name))
-        return out
-
     def set_index(self, keys, drop=True, append=False, inplace=False,
                   verify_integrity=False):
         """

diff --git a/pandas/core/generic.py b/pandas/core/generic.py
@@ -2777,6 +2777,57 @@ def sort_index(self, axis=0, level=None, ascending=True, inplace=False,
         new_axis = labels.take(sort_index)
         return self.reindex(**{axis_name: new_axis})
 
+    def _validate_axis_style_args(self, args, kwargs, arg_name, method_name):
+        out = {}
+        # Goal: fill out with index/columns-style arguments
+        # like out = {'index': foo, 'columns': bar}
+        # Start by validaing for consistency
+        if 'axis' in kwargs and any(x in kwargs for x in self._AXIS_NUMBERS):
+            msg = "Cannot specify both 'axis' and any of 'columns' or 'index'."
+            raise TypeError(msg)
+
+        # Start with explicit values provided by the user...
+        if arg_name in kwargs:
+            if args:
+                msg = "{} got multiple values for argument '{}'".format(
+                    method_name, arg_name)
+                raise TypeError(msg)
+            axis = self._get_axis_name(kwargs.get('axis', 0))
+            out[axis] = kwargs[arg_name]
+
+        # fill in axes
+        for k, v in kwargs.items():
+            try:
+                ax = self._get_axis_name(k)
+            except ValueError:
+                pass
+            else:
+                out[ax] = v
+
+        # All user-provided kwargs have been handled now.
+        # Now we supplement with positional arguments, raising when there's
+        # ambiguity
+
+        if len(args) == 0:
+            pass  # validate later
+        elif len(args) == 1:
+            axis = self._get_axis_name(kwargs.get('axis', 0))
+            out[axis] = args[0]
+        elif len(args) == 2:
+            if 'axis' in kwargs:
+                msg = "Cannot specify both {} and any of 'index' or 'columns'"
+                raise TypeError(msg.format(arg_name))
+            msg = ("Intepreting call\n\t'.{method_name}(a, b)' as "
+                   "\n\t'.{method_name}(index=a, columns=b)'.\nUse named "
+                   "arguments to remove any ambiguity.")
+            warnings.warn(msg.format(method_name=method_name,), stacklevel=3)
+            out[self._AXIS_NAMES[0]] = args[0]
+            out[self._AXIS_NAMES[1]] = args[1]
+        else:
+            msg = "Cannot specify all of '{}', 'index', 'columns'."
+            raise TypeError(msg.format(arg_name))
+        return out
+
     _shared_docs['reindex'] = """
         Conform %(klass)s to new index with optional filling logic, placing
         NA/NaN in locations having no value in the previous index. A new object

diff --git a/pandas/core/panel.py b/pandas/core/panel.py
@@ -1199,20 +1199,31 @@ def _wrap_result(self, result, axis):
         return self._construct_return_type(result, axes)
 
     @Appender(_shared_docs['reindex'] % _shared_doc_kwargs)
-    def reindex(self, labels=None,
-                items=None, major_axis=None, minor_axis=None,
-                axis=None, **kwargs):
-        major_axis = (major_axis if major_axis is not None else
-                      kwargs.pop('major', None))
-        minor_axis = (minor_axis if minor_axis is not None else
-                      kwargs.pop('minor', None))
-        axes = self._validate_axis_style_args(
-            labels, 'labels', axes=[items, major_axis, minor_axis],
-            axis=axis, method_name='reindex')
+    def reindex(self, *args, **kwargs):
+        major = kwargs.pop("major", None)
+        minor = kwargs.pop('minor', None)
+
+        if major is not None:
+            if kwargs.get("major_axis"):
+                raise TypeError("Cannot specify both 'major' and 'major_axis'")
+            kwargs['major_axis'] = major
+        if minor is not None:
+            if kwargs.get("minor_axis"):
+                raise TypeError("Cannot specify both 'minor' and 'minor_axis'")
+
+            kwargs['minor_axis'] = minor
+        # major_axis = (major_axis if major_axis is not None else
+        #               kwargs.pop('major', None))
+        # minor_axis = (minor_axis if minor_axis is not None else
+        #               kwargs.pop('minor', None))
+        axes = self._validate_axis_style_args(args, kwargs, 'labels',
+                                              'reindex')
         if self.ndim >= 4:
             # Hack for PanelND
             axes = {}
         kwargs.update(axes)
+        kwargs.pop('axis', None)
+        kwargs.pop('labels', None)
         return super(Panel, self).reindex(**kwargs)
 
     @Appender(_shared_docs['rename'] % _shared_doc_kwargs)