diff --git a/pandas/_typing.py b/pandas/_typing.py index f8af92e07c674..2d6f23ad92885 100644 --- a/pandas/_typing.py +++ b/pandas/_typing.py @@ -40,7 +40,9 @@ # array-like AnyArrayLike = TypeVar("AnyArrayLike", "ExtensionArray", "Index", "Series", np.ndarray) +AnyArrayLikeUnion = Union["ExtensionArray", "Index", "Series", np.ndarray] ArrayLike = TypeVar("ArrayLike", "ExtensionArray", np.ndarray) +ArrayLikeUnion = Union["ExtensionArray", np.ndarray] # scalars diff --git a/pandas/core/reshape/merge.py b/pandas/core/reshape/merge.py index 01e20f49917ac..c21425d101d35 100644 --- a/pandas/core/reshape/merge.py +++ b/pandas/core/reshape/merge.py @@ -13,7 +13,7 @@ from pandas._libs import Timedelta, hashtable as libhashtable, lib import pandas._libs.join as libjoin -from pandas._typing import ArrayLike, FrameOrSeries +from pandas._typing import ArrayLikeUnion, FrameOrSeries from pandas.errors import MergeError from pandas.util._decorators import Appender, Substitution @@ -1869,7 +1869,7 @@ def _right_outer_join(x, y, max_groups): def _factorize_keys( - lk: ArrayLike, rk: ArrayLike, sort: bool = True, how: str = "inner" + lk: ArrayLikeUnion, rk: ArrayLikeUnion, sort: bool = True, how: str = "inner" ) -> Tuple[np.array, np.array, int]: """ Encode left and right keys as enumerated types. diff --git a/pandas/io/pytables.py b/pandas/io/pytables.py index 0913627324c48..8282b36a019d1 100644 --- a/pandas/io/pytables.py +++ b/pandas/io/pytables.py @@ -16,7 +16,7 @@ from pandas._libs import lib, writers as libwriters from pandas._libs.tslibs import timezones -from pandas._typing import ArrayLike, FrameOrSeries, Label +from pandas._typing import AnyArrayLikeUnion, ArrayLike, FrameOrSeries, Label from pandas.compat._optional import import_optional_dependency from pandas.compat.pickle_compat import patch_pickle from pandas.errors import PerformanceWarning @@ -5076,7 +5076,7 @@ def _dtype_to_kind(dtype_str: str) -> str: return kind -def _get_data_and_dtype_name(data: ArrayLike): +def _get_data_and_dtype_name(data: AnyArrayLikeUnion): """ Convert the passed data into a storable form and a dtype string. """