cleanup

Author: dcherian

xarray/core/dataarray.py

@@ -6789,12 +6789,10 @@ def groupby(
         from xarray.core.groupby import (
             DataArrayGroupBy,
             _parse_group_and_groupers,
-            _validate_group_and_groupers,
             _validate_groupby_squeeze,
         )
 
         _validate_groupby_squeeze(squeeze)
-        _validate_group_and_groupers(group, groupers)
         rgroupers = _parse_group_and_groupers(self, group, groupers)
         return DataArrayGroupBy(self, rgroupers, restore_coord_dims=restore_coord_dims)
 

xarray/core/dataset.py

@@ -10385,12 +10385,10 @@ def groupby(
         from xarray.core.groupby import (
             DatasetGroupBy,
             _parse_group_and_groupers,
-            _validate_group_and_groupers,
             _validate_groupby_squeeze,
         )
 
         _validate_groupby_squeeze(squeeze)
-        _validate_group_and_groupers(group, groupers)
         rgroupers = _parse_group_and_groupers(self, group, groupers)
 
         return DatasetGroupBy(self, rgroupers, restore_coord_dims=restore_coord_dims)

xarray/core/groupby.py

@@ -326,6 +326,19 @@ def _parse_group_and_groupers(
     from xarray.core.variable import Variable
     from xarray.groupers import UniqueGrouper
 
+    if group is not None and groupers:
+        raise ValueError(
+            "Providing a combination of `group` and **groupers is not supported."
+        )
+
+    if group is None and not groupers:
+        raise ValueError("Either `group` or `**groupers` must be provided.")
+
+    if isinstance(group, np.ndarray | pd.Index):
+        raise TypeError(
+            f"`group` must be a DataArray. Received {type(group).__name__!r} instead"
+        )
+
     if isinstance(group, Mapping):
         grouper_mapping = either_dict_or_kwargs(group, groupers, "groupby")
         group = None
@@ -351,21 +364,6 @@ def _parse_group_and_groupers(
     return rgroupers
 
 
-def _validate_group_and_groupers(group: GroupInput, groupers: dict[str, Grouper]):
-    if group is not None and groupers:
-        raise ValueError(
-            "Providing a combination of `group` and **groupers is not supported."
-        )
-
-    if group is None and not groupers:
-        raise ValueError("Either `group` or `**groupers` must be provided.")
-
-    if isinstance(group, np.ndarray | pd.Index):
-        raise TypeError(
-            f"`group` must be a DataArray. Received {type(group).__name__!r} instead"
-        )
-
-
 def _validate_groupby_squeeze(squeeze: Literal[False]) -> None:
     # While we don't generally check the type of every arg, passing
     # multiple dimensions as multiple arguments is common enough, and the