ERR: raise KeyError on invalid column name in aggregate

xref pandas-dev#19552

Author: jreback

pandas/core/base.py

@@ -394,7 +394,7 @@ def nested_renaming_depr(level=4):
                         nested_renaming_depr()
                     elif isinstance(obj, ABCDataFrame) and \
                             k not in obj.columns:
-                        raise ValueError(
+                        raise KeyError(
                             "Column '{col}' does not exist!".format(col=k))
 
                 arg = new_arg

pandas/tests/test_resample.py

@@ -613,7 +613,7 @@ def f():
                     t[['A']].agg({'A': ['sum', 'std'],
                                   'B': ['mean', 'std']})
 
-            pytest.raises(ValueError, f)
+            pytest.raises(KeyError, f)
 
     def test_agg_nested_dicts(self):
 
@@ -668,7 +668,7 @@ def test_try_aggregate_non_existing_column(self):
         df = DataFrame(data).set_index('dt')
 
         # Error as we don't have 'z' column
-        with pytest.raises(ValueError):
+        with pytest.raises(KeyError):
             df.resample('30T').agg({'x': ['mean'],
                                     'y': ['median'],
                                     'z': ['sum']})