TST/CLN: raise error when resampling with on= or level= selection

Added tests to cover all code paths, moved the check to _convert_obj() and
removed then-redundant check from _upsample() method.

Author: winklerand

pandas/core/resample.py

@@ -842,6 +842,13 @@ def _get_binner_for_time(self):
     def _convert_obj(self, obj):
         obj = super(PeriodIndexResampler, self)._convert_obj(obj)
 
+        if self._from_selection:
+            # see GH 14008, GH 12871
+            msg = ("Resampling from level= or on= selection"
+                   " with a PeriodIndex is not currently supported,"
+                   " use .set_index(...) to explicitly set index")
+            raise NotImplementedError(msg)
+
         offset = to_offset(self.freq)
         if offset.n > 1:
             if self.kind == 'period':  # pragma: no cover
@@ -852,14 +859,7 @@ def _convert_obj(self, obj):
 
         # convert to timestamp
         if not (self.kind is None or self.kind == 'period'):
-            if self._from_selection:
-                # see GH 14008, GH 12871
-                msg = ("Resampling from level= or on= selection"
-                       " with a PeriodIndex is not currently supported,"
-                       " use .set_index(...) to explicitly set index")
-                raise NotImplementedError(msg)
-            else:
-                obj = obj.to_timestamp(how=self.convention)
+            obj = obj.to_timestamp(how=self.convention)
 
         return obj
 
@@ -906,11 +906,7 @@ def _upsample(self, method, limit=None, fill_value=None):
         .fillna
 
         """
-        if self._from_selection:
-            raise ValueError("Upsampling from level= or on= selection"
-                             " is not supported, use .set_index(...)"
-                             " to explicitly set index to"
-                             " datetime-like")
+
         # we may need to actually resample as if we are timestamps
         if self.kind == 'timestamp':
             return super(PeriodIndexResampler, self)._upsample(

pandas/tests/test_resample.py

@@ -2294,12 +2294,17 @@ def test_selection(self):
                           index=pd.MultiIndex.from_arrays([
                               np.arange(len(index), dtype=np.int64),
                               index], names=['v', 'd']))
-
-        with pytest.raises(NotImplementedError):
-            df.resample('2D', on='date')
-
-        with pytest.raises(NotImplementedError):
-            df.resample('2D', level='d')
+        for freq in ['H', '12H', '2D', 'W']:
+            # check up- and downsampling with base freqs and freq multiples
+            with pytest.raises(NotImplementedError):
+                df.resample(freq, on='date')
+            with pytest.raises(NotImplementedError):
+                df.resample(freq, level='d')
+            for kind_param in ['timestamp', 'period']:
+                with pytest.raises(NotImplementedError):
+                    df.resample(freq, on='date', kind=kind_param)
+                with pytest.raises(NotImplementedError):
+                    df.resample(freq, level='d', kind=kind_param)
 
     def test_annual_upsample_D_s_f(self):
         self._check_annual_upsample_cases('D', 'start', 'ffill')