Merge remote-tracking branch 'upstream/master' into depr_LL_set_index

pandas-dev · h-vetinari · Jan 10, 2019 · Jan 10, 2019 · Jan 10, 2019 · Jan 10, 2019
commit c881aaa64d400221404b9c0c4d90df4aa0649d7e
diff --git a/pandas/core/frame.py b/pandas/core/frame.py
@@ -4025,9 +4025,14 @@ def set_index(self, keys, drop=True, append=False, inplace=False,
             This parameter can be either a single column key, a single array of
             the same length as the calling DataFrame, or a list containing an
             arbitrary combination of column keys and arrays. Here, "array"
+<<<<<<< HEAD
             encompasses :class:`Series`, :class:`Index` and ``np.ndarray``.
             Lists (in the sense of a sequence of values, not column labels)
             have been deprecated, and will be removed in a future version.
+=======
+            encompasses :class:`Series`, :class:`Index`, ``np.ndarray``, and
+            instances of :class:`abc.Iterator`.
+>>>>>>> upstream/master
         drop : bool, default True
             Delete columns to be used as the new index.
         append : bool, default False
@@ -4113,6 +4118,7 @@ def set_index(self, keys, drop=True, append=False, inplace=False,
         missing = []
         depr_warn = False
         for col in keys:
+<<<<<<< HEAD
             if (is_scalar(col) or isinstance(col, tuple)):
                 # if col is a valid column key, everything is fine
                 # tuples are always considered keys, never as list-likes
@@ -4133,6 +4139,27 @@ def set_index(self, keys, drop=True, append=False, inplace=False,
                    'or np.ndarray. E.g. df.set_index(["A", [1, 2, 3]]) should '
                    'be passed as df.set_index(["A", pd.Series([1, 2, 3])]).')
             warnings.warn(msg, FutureWarning, stacklevel=2)
+=======
+            if isinstance(col, (ABCIndexClass, ABCSeries, np.ndarray,
+                                list, Iterator)):
+                # arrays are fine as long as they are one-dimensional
+                # iterators get converted to list below
+                if getattr(col, 'ndim', 1) != 1:
+                    raise ValueError(err_msg)
+            else:
+                # everything else gets tried as a key; see GH 24969
+                try:
+                    found = col in self.columns
+                except TypeError:
+                    raise TypeError(err_msg + ' Received column of '
+                                    'type {}'.format(type(col)))
+                else:
+                    if not found:
+                        missing.append(col)
+
+        if missing:
+            raise KeyError('None of {} are in the columns'.format(missing))
+>>>>>>> upstream/master
 
         if inplace:
             frame = self

diff --git a/pandas/tests/frame/test_alter_axes.py b/pandas/tests/frame/test_alter_axes.py
@@ -279,12 +279,21 @@ def test_set_index_raise_on_type(self, frame_of_index_cols, box,
         df = frame_of_index_cols
 
         msg = 'The parameter "keys" may be a column key, .*'
+<<<<<<< HEAD
         # forbidden type, e.g. set/iter
         with pytest.raises(ValueError, match=msg):
             df.set_index(box(df['A']), drop=drop, append=append)
 
         # forbidden type in list, e.g. set/iter
         with pytest.raises(ValueError, match=msg):
+=======
+        # forbidden type, e.g. set
+        with pytest.raises(TypeError, match=msg):
+            df.set_index(box(df['A']), drop=drop, append=append)
+
+        # forbidden type in list, e.g. set
+        with pytest.raises(TypeError, match=msg):
+>>>>>>> upstream/master
             df.set_index(['A', df['A'], box(df['A'])],
                          drop=drop, append=append)