moved base.whitelist_method_generator to .generic

Author: topper-123

pandas/_typing.py

@@ -9,7 +9,7 @@
 
 from pandas.core.dtypes.dtypes import ExtensionDtype
 from pandas.core.dtypes.generic import (
-    ABCExtensionArray, ABCIndexClass, ABCSeries, ABCSparseSeries)
+    ABCDataFrame, ABCExtensionArray, ABCIndexClass, ABCSeries, ABCSparseSeries)
 
 AnyArrayLike = TypeVar('AnyArrayLike',
                        ABCExtensionArray,
@@ -22,3 +22,5 @@
                              Timedelta)
 Dtype = Union[str, np.dtype, ExtensionDtype]
 FilePathOrBuffer = Union[str, Path, IO[AnyStr]]
+
+FrameOrSeries = TypeVar('FrameOrSeries', ABCSeries, ABCDataFrame)

pandas/core/groupby/base.py

@@ -3,14 +3,8 @@
 hold the whitelist of methods that are exposed on the
 SeriesGroupBy and the DataFrameGroupBy objects.
 """
-from typing import TYPE_CHECKING, FrozenSet, Iterator, Type, Union
-
 from pandas.core.dtypes.common import is_list_like, is_scalar
 
-if TYPE_CHECKING:
-    from pandas import DataFrame, Series
-    from .groupby import GroupBy
-
 
 class GroupByMixin:
     """
@@ -92,48 +86,3 @@ def _gotitem(self, key, ndim, subset=None):
 
 cython_cast_blacklist = frozenset(['rank', 'count', 'size', 'idxmin',
                                    'idxmax'])
-
-
-def whitelist_method_generator(base: 'Type[GroupBy]',
-                               klass: 'Union[Type[DataFrame], Type[Series]]',
-                               whitelist: FrozenSet[str],
-                               ) -> Iterator[str]:
-    """
-    Yields all GroupBy member defs for DataFrame/Series names in whitelist.
-
-    Parameters
-    ----------
-    base : Groupby class
-        base class
-    klass : DataFrame or Series class
-        class where members are defined.
-    whitelist : frozenset
-        Set of names of klass methods to be constructed
-
-    Returns
-    -------
-    The generator yields a sequence of strings, each suitable for exec'ing,
-    that define implementations of the named methods for DataFrameGroupBy
-    or SeriesGroupBy.
-
-    Since we don't want to override methods explicitly defined in the
-    base class, any such name is skipped.
-    """
-    property_wrapper_template = \
-        """@property
-def %(name)s(self) :
-    \"""%(doc)s\"""
-    return self.__getattr__('%(name)s')"""
-
-    for name in whitelist:
-        # don't override anything that was explicitly defined
-        # in the base class
-        if hasattr(base, name):
-            continue
-        # ugly, but we need the name string itself in the method.
-        f = getattr(klass, name)
-        doc = f.__doc__
-        doc = doc if type(doc) == str else ''
-        wrapper_template = property_wrapper_template
-        params = {'name': name, 'doc': doc}
-        yield wrapper_template % params

pandas/core/groupby/generic.py

@@ -11,7 +11,7 @@
 from functools import partial
 from textwrap import dedent
 import typing
-from typing import Any, Callable, List, Union
+from typing import Any, Callable, FrozenSet, Iterator, List, Type, Union
 import warnings
 
 import numpy as np
@@ -27,6 +27,7 @@
     is_integer_dtype, is_interval_dtype, is_numeric_dtype, is_scalar)
 from pandas.core.dtypes.missing import isna, notna
 
+from pandas._typing import FrameOrSeries
 import pandas.core.algorithms as algorithms
 from pandas.core.base import DataError, SpecificationError
 import pandas.core.common as com
@@ -48,6 +49,51 @@
 AggScalar = Union[str, Callable[..., Any]]
 
 
+def whitelist_method_generator(base_class: Type[GroupBy],
+                               klass: Type[FrameOrSeries],
+                               whitelist: FrozenSet[str],
+                               ) -> Iterator[str]:
+    """
+    Yields all GroupBy member defs for DataFrame/Series names in whitelist.
+
+    Parameters
+    ----------
+    base_class : Groupby class
+        base class
+    klass : DataFrame or Series class
+        class where members are defined.
+    whitelist : frozenset
+        Set of names of klass methods to be constructed
+
+    Returns
+    -------
+    The generator yields a sequence of strings, each suitable for exec'ing,
+    that define implementations of the named methods for DataFrameGroupBy
+    or SeriesGroupBy.
+
+    Since we don't want to override methods explicitly defined in the
+    base class, any such name is skipped.
+    """
+    property_wrapper_template = \
+        """@property
+def %(name)s(self) :
+    \"""%(doc)s\"""
+    return self.__getattr__('%(name)s')"""
+
+    for name in whitelist:
+        # don't override anything that was explicitly defined
+        # in the base class
+        if hasattr(base_class, name):
+            continue
+        # ugly, but we need the name string itself in the method.
+        f = getattr(klass, name)
+        doc = f.__doc__
+        doc = doc if type(doc) == str else ''
+        wrapper_template = property_wrapper_template
+        params = {'name': name, 'doc': doc}
+        yield wrapper_template % params
+
+
 class NDFrameGroupBy(GroupBy):
 
     def _iterate_slices(self):
@@ -685,7 +731,7 @@ class SeriesGroupBy(GroupBy):
     # Make class defs of attributes on SeriesGroupBy whitelist
 
     _apply_whitelist = base.series_apply_whitelist
-    for _def_str in base.whitelist_method_generator(
+    for _def_str in whitelist_method_generator(
             GroupBy, Series, _apply_whitelist):
         exec(_def_str)
 
@@ -1289,7 +1335,7 @@ class DataFrameGroupBy(NDFrameGroupBy):
 
     #
     # Make class defs of attributes on DataFrameGroupBy whitelist.
-    for _def_str in base.whitelist_method_generator(
+    for _def_str in whitelist_method_generator(
             GroupBy, DataFrame, _apply_whitelist):
         exec(_def_str)