another strategy

MarcoGorelli · Oct 26, 2024 · 77cb4b7 · 77cb4b7
1 parent e6e82e0
commit 77cb4b7
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/narwhals/_pandas_like/group_by.py b/narwhals/_pandas_like/group_by.py
@@ -101,16 +101,19 @@ def _from_native_frame(self, df: PandasLikeDataFrame) -> PandasLikeDataFrame:
         )
 
     def __iter__(self) -> Iterator[tuple[Any, PandasLikeDataFrame]]:
+        indices = self._grouped.indices
         with warnings.catch_warnings():
             # we already use `tupleify` above, so we're already opting in to
             # the new behaviour
             warnings.filterwarnings(
                 "ignore",
-                message="In a future version of pandas, a length 1 tuple will be returned",
+                message="When grouping with a length-1",
                 category=FutureWarning,
             )
-            iterator = self._grouped.__iter__()
-        yield from ((key, self._from_native_frame(sub_df)) for (key, sub_df) in iterator)
+            yield from (
+                (key, self._from_native_frame(self._grouped.get_group(key)))
+                for key in indices
+            )
 
 
 def agg_pandas(  # noqa: PLR0915