Fix details

Author: Moons08

pandas/core/indexes/base.py

@@ -1278,31 +1278,37 @@ def _set_names(self, values, level=None):
 
     def set_names(self, names, level=None, inplace=False):
         """
-        Set new names on index. Defaults to returning new index.
+        Alter Index or MultiIndex name or level.
+
+        Able to set new names partially and by level.
 
         Parameters
         ----------
-        names : str or sequence
+        names : int, str, list-like, optional
             Name(s) to set.
-        level : int, level name, or sequence of int/level names (default None)
-            If the index is a MultiIndex (hierarchical), level(s) to set (None
-            for all levels).  Otherwise level must be None.
-        inplace : bool
-            If True, mutates in place.
+        level : int, str, list-like, optional, default None
+            If the index is a MultiIndex(hierarchical), level(s) to set (None
+            for all levels). Otherwise level must be None.
+        inplace : boolean, default False
+            Modifies the object directly, instead of creating a new Index or
+            MultiIndex.
 
         Returns
         -------
-        new index (of same type and class...etc) [if inplace, returns None]
+        renamed : Index, MultiIndex or None
+            The same type as the caller or None if inplace is True.
+
+        See also
+        --------
+        Index.rename : Able to set new names without level
 
         Examples
         --------
         >>> pd.Index([1, 2, 3, 4]).set_names('foo')
         Int64Index([1, 2, 3, 4], dtype='int64', name='foo')
-        >>> pd.Index([1, 2, 3, 4]).set_names(['foo'])
-        Int64Index([1, 2, 3, 4], dtype='int64', name='foo')
 
-        >>> idx = pd.MultiIndex.from_tuples([(1, u'one'), (1, u'two'),
-        ...                                  (2, u'one'), (2, u'two')],
+        >>> idx = pd.MultiIndex.from_tuples([(1, 'one'), (1, 'two'),
+        ...                                  (2, 'one'), (2, 'two')],
         ...                                  names=['foo', 'bar'])
         >>> idx.set_names(['baz', 'quz'])
         MultiIndex(levels=[[1, 2], ['one', 'two']],
@@ -1312,10 +1318,6 @@ def set_names(self, names, level=None, inplace=False):
         MultiIndex(levels=[[1, 2], ['one', 'two']],
                    labels=[[0, 0, 1, 1], [0, 1, 0, 1]],
                    names=['baz', 'bar'])
-
-        See also
-        --------
-        rename : able to set new names without level
         """
 
         from .multi import MultiIndex
@@ -1324,7 +1326,8 @@ def set_names(self, names, level=None, inplace=False):
 
         if level is not None and not is_list_like(level) and is_list_like(
                 names):
-            raise TypeError("Names must be a string")
+            msg = "Length of names must match number of levels in MultiIndex."
+            raise TypeError(msg)
 
         if not is_list_like(names) and level is None and self.nlevels > 1:
             raise TypeError("Must pass list-like as `names`.")
@@ -1344,29 +1347,36 @@ def set_names(self, names, level=None, inplace=False):
 
     def rename(self, name, inplace=False):
         """
-        Set new names on index. Defaults to returning new index.
+        Alter Index or MultiIndex name.
 
+        Able to set new names without level. Defaults to returning new index.
         Length of names must match number of levels in MultiIndex.
 
         Parameters
         ----------
-        name : str or list
+        name : int, str, list-like, optional
             Name(s) to set.
-        inplace : bool
-            If True, mutates in place.
+        inplace : boolean, default False
+            Modifies the object directly, instead of creating a new Index or
+            MultiIndex.
 
         Returns
         -------
-        new index (of same type and class...etc) [if inplace, returns None]
+        renamed : Index, MultiIndex or None
+            The same type as the caller or None if inplace is True.
+
+        See also
+        --------
+        Index.set_names : Able to set new names partially and by level
 
         Examples
         --------
         >>> idx = pd.Index([1, 2, 3, 4], name='foo')
         >>> idx.rename('bar')
         Int64Index([1, 2, 3, 4], dtype='int64', name='bar')
 
-        >>> idx = pd.MultiIndex.from_tuples([(1, u'one'), (1, u'two'),
-        ...                                  (2, u'one'), (2, u'two')],
+        >>> idx = pd.MultiIndex.from_tuples([(1, 'one'), (1, 'two'),
+        ...                                  (2, 'one'), (2, 'two')],
         ...                                  names=['foo', 'bar'])
         >>> idx.rename(['bar', None])
         MultiIndex(levels=[[1, 2], ['one', 'two']],
@@ -1375,10 +1385,6 @@ def rename(self, name, inplace=False):
         >>> idx.rename(['bar'])
         Traceback (most recent call last):
         ValueError: Length of names must match number of levels in MultiIndex.
-
-        See also
-        --------
-        set_names : able to set new names partially and by level
         """
         return self.set_names([name], inplace=inplace)