|
27 | 27 | ArrayLike, |
28 | 28 | DtypeObj, |
29 | 29 | FrameOrSeries, |
30 | | - FrameOrSeriesUnion, |
31 | 30 | IndexLabel, |
32 | 31 | Suffixes, |
33 | 32 | ) |
|
81 | 80 | from pandas.core.sorting import is_int64_overflow_possible |
82 | 81 |
|
83 | 82 | if TYPE_CHECKING: |
84 | | - from pandas import DataFrame |
| 83 | + from pandas import ( |
| 84 | + DataFrame, |
| 85 | + Series, |
| 86 | + ) |
85 | 87 | from pandas.core.arrays import DatetimeArray |
86 | 88 |
|
87 | 89 |
|
88 | | -@Substitution("\nleft : DataFrame") |
| 90 | +@Substitution("\nleft : DataFrame or named Series") |
89 | 91 | @Appender(_merge_doc, indents=0) |
90 | 92 | def merge( |
91 | | - left: FrameOrSeriesUnion, |
92 | | - right: FrameOrSeriesUnion, |
| 93 | + left: DataFrame | Series, |
| 94 | + right: DataFrame | Series, |
93 | 95 | how: str = "inner", |
94 | 96 | on: IndexLabel | None = None, |
95 | 97 | left_on: IndexLabel | None = None, |
@@ -322,8 +324,8 @@ def _merger(x, y) -> DataFrame: |
322 | 324 |
|
323 | 325 |
|
324 | 326 | def merge_asof( |
325 | | - left: DataFrame, |
326 | | - right: DataFrame, |
| 327 | + left: DataFrame | Series, |
| 328 | + right: DataFrame | Series, |
327 | 329 | on: IndexLabel | None = None, |
328 | 330 | left_on: IndexLabel | None = None, |
329 | 331 | right_on: IndexLabel | None = None, |
@@ -362,8 +364,8 @@ def merge_asof( |
362 | 364 |
|
363 | 365 | Parameters |
364 | 366 | ---------- |
365 | | - left : DataFrame |
366 | | - right : DataFrame |
| 367 | + left : DataFrame or named Series |
| 368 | + right : DataFrame or named Series |
367 | 369 | on : label |
368 | 370 | Field name to join on. Must be found in both DataFrames. |
369 | 371 | The data MUST be ordered. Furthermore this must be a numeric column, |
@@ -608,8 +610,8 @@ class _MergeOperation: |
608 | 610 |
|
609 | 611 | def __init__( |
610 | 612 | self, |
611 | | - left: FrameOrSeriesUnion, |
612 | | - right: FrameOrSeriesUnion, |
| 613 | + left: DataFrame | Series, |
| 614 | + right: DataFrame | Series, |
613 | 615 | how: str = "inner", |
614 | 616 | on: IndexLabel | None = None, |
615 | 617 | left_on: IndexLabel | None = None, |
@@ -1599,8 +1601,8 @@ class _OrderedMerge(_MergeOperation): |
1599 | 1601 |
|
1600 | 1602 | def __init__( |
1601 | 1603 | self, |
1602 | | - left: DataFrame, |
1603 | | - right: DataFrame, |
| 1604 | + left: DataFrame | Series, |
| 1605 | + right: DataFrame | Series, |
1604 | 1606 | on: IndexLabel | None = None, |
1605 | 1607 | left_on: IndexLabel | None = None, |
1606 | 1608 | right_on: IndexLabel | None = None, |
@@ -1704,8 +1706,8 @@ class _AsOfMerge(_OrderedMerge): |
1704 | 1706 |
|
1705 | 1707 | def __init__( |
1706 | 1708 | self, |
1707 | | - left: DataFrame, |
1708 | | - right: DataFrame, |
| 1709 | + left: DataFrame | Series, |
| 1710 | + right: DataFrame | Series, |
1709 | 1711 | on: IndexLabel | None = None, |
1710 | 1712 | left_on: IndexLabel | None = None, |
1711 | 1713 | right_on: IndexLabel | None = None, |
|
0 commit comments