combine two if

Author: natmokval

pandas/core/arrays/datetimelike.py

@@ -1661,11 +1661,8 @@ def _groupby_op(
         dtype = self.dtype
         if dtype.kind == "M":
             # Adding/multiplying datetimes is not valid
-            if how in ["sum", "prod", "cumsum", "cumprod", "var", "skew"]:
+            if how in ["any", "all", "sum", "prod", "cumsum", "cumprod", "var", "skew"]:
                 raise TypeError(f"datetime64 type does not support {how} operations")
-            if how in ["any", "all"]:
-                # GH#34479
-                raise TypeError(f"'{how}' with datetime64 dtypes is not supported")
 
         elif isinstance(dtype, PeriodDtype):
             # Adding/multiplying Periods is not valid

pandas/core/nanops.py

@@ -520,7 +520,7 @@ def nanany(
 
     if values.dtype.kind == "M":
         # GH#34479
-        raise TypeError("'any' with datetime64 dtypes is not supported")
+        raise TypeError("datetime64 type does not support any operations")
 
     values, _ = _get_values(values, skipna, fill_value=False, mask=mask)
 
@@ -576,7 +576,7 @@ def nanall(
 
     if values.dtype.kind == "M":
         # GH#34479
-        raise TypeError("'all' with datetime64 dtypes is not supported")
+        raise TypeError("datetime64 type does not support all operations")
 
     values, _ = _get_values(values, skipna, fill_value=True, mask=mask)
 

pandas/tests/extension/test_datetime.py

@@ -104,7 +104,7 @@ def _supports_reduction(self, obj, op_name: str) -> bool:
     @pytest.mark.parametrize("skipna", [True, False])
     def test_reduce_series_boolean(self, data, all_boolean_reductions, skipna):
         meth = all_boolean_reductions
-        msg = f"'{meth}' with datetime64 dtypes is not supported"
+        msg = f"datetime64 type does not support {meth} operations"
         with pytest.raises(TypeError, match=msg):
             super().test_reduce_series_boolean(data, all_boolean_reductions, skipna)
 

pandas/tests/frame/test_reductions.py

@@ -1382,7 +1382,7 @@ def test_any_datetime(self):
         ]
         df = DataFrame({"A": float_data, "B": datetime_data})
 
-        msg = "'any' with datetime64 dtypes is not supported"
+        msg = "datetime64 type does not support any operations"
         with pytest.raises(TypeError, match=msg):
             df.any(axis=1)
 
@@ -1478,7 +1478,7 @@ def test_any_all_np_func(self, func, data, expected):
                 getattr(DataFrame(data), func.__name__)(axis=None)
         if data.dtypes.apply(lambda x: x.kind == "M").any():
             # GH#34479
-            msg = "'(any|all)' with datetime64 dtypes is not supported"
+            msg = "datetime64 type does not support (any|all) operations"
             with pytest.raises(TypeError, match=msg):
                 func(data)
 

pandas/tests/groupby/test_raises.py

@@ -241,8 +241,8 @@ def test_groupby_raises_datetime(
             return
 
     klass, msg = {
-        "all": (TypeError, "'all' with datetime64 dtypes is not supported"),
-        "any": (TypeError, "'any' with datetime64 dtypes is not supported"),
+        "all": (TypeError, "datetime64 type does not support all operations"),
+        "any": (TypeError, "datetime64 type does not support any operations"),
         "bfill": (None, ""),
         "corrwith": (TypeError, "cannot perform __mul__ with this index type"),
         "count": (None, ""),

pandas/tests/reductions/test_reductions.py

@@ -1010,7 +1010,7 @@ def test_any_all_datetimelike(self):
         df = DataFrame(ser)
 
         # GH#34479
-        msg = "'(any|all)' with datetime64 dtypes is not supported"
+        msg = "datetime64 type does not support (any|all) operations"
         with pytest.raises(TypeError, match=msg):
             dta.all()
         with pytest.raises(TypeError, match=msg):