From 30bf1edae2b44402899cfccb6ffb6359f0ed21b2 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 27 Aug 2019 13:48:47 +0100 Subject: [PATCH 1/2] TYPING: change to FrameOrSeries Alias in pandas._typing --- pandas/_typing.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandas/_typing.py b/pandas/_typing.py index 837a7a89e0b83..d70eda2dbf174 100644 --- a/pandas/_typing.py +++ b/pandas/_typing.py @@ -11,9 +11,9 @@ from pandas.core.arrays.base import ExtensionArray # noqa: F401 from pandas.core.dtypes.dtypes import ExtensionDtype # noqa: F401 from pandas.core.indexes.base import Index # noqa: F401 - from pandas.core.frame import DataFrame # noqa: F401 from pandas.core.series import Series # noqa: F401 from pandas.core.sparse.series import SparseSeries # noqa: F401 + from pandas.core.generic import NDFrame # noqa: F401 AnyArrayLike = TypeVar( @@ -24,7 +24,8 @@ Dtype = Union[str, np.dtype, "ExtensionDtype"] FilePathOrBuffer = Union[str, Path, IO[AnyStr]] -FrameOrSeries = TypeVar("FrameOrSeries", "Series", "DataFrame") +FrameOrSeries = TypeVar("FrameOrSeries", bound="NDFrame") Scalar = Union[str, int, float] Axis = Union[str, int] Ordered = Optional[bool] +_T = TypeVar("_T") From c46de9786acd86710f21257deb166e3781da5822 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 27 Aug 2019 21:07:37 +0100 Subject: [PATCH 2/2] add comment --- pandas/_typing.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandas/_typing.py b/pandas/_typing.py index d70eda2dbf174..37a5d7945955d 100644 --- a/pandas/_typing.py +++ b/pandas/_typing.py @@ -28,4 +28,6 @@ Scalar = Union[str, int, float] Axis = Union[str, int] Ordered = Optional[bool] + +# to maintain type information across generic functions and parametrization _T = TypeVar("_T")