|
1 | 1 | """ |
2 | 2 | SQL-style merge routines |
3 | 3 | """ |
| 4 | +from __future__ import annotations |
4 | 5 |
|
5 | 6 | import copy |
6 | 7 | import datetime |
@@ -99,7 +100,7 @@ def merge( |
99 | 100 | merge.__doc__ = _merge_doc % "\nleft : DataFrame" |
100 | 101 |
|
101 | 102 |
|
102 | | -def _groupby_and_merge(by, on, left: "DataFrame", right: "DataFrame", merge_pieces): |
| 103 | +def _groupby_and_merge(by, on, left: DataFrame, right: DataFrame, merge_pieces): |
103 | 104 | """ |
104 | 105 | groupby & merge; we are always performing a left-by type operation |
105 | 106 |
|
@@ -157,8 +158,8 @@ def _groupby_and_merge(by, on, left: "DataFrame", right: "DataFrame", merge_piec |
157 | 158 |
|
158 | 159 |
|
159 | 160 | def merge_ordered( |
160 | | - left: "DataFrame", |
161 | | - right: "DataFrame", |
| 161 | + left: DataFrame, |
| 162 | + right: DataFrame, |
162 | 163 | on: Optional[IndexLabel] = None, |
163 | 164 | left_on: Optional[IndexLabel] = None, |
164 | 165 | right_on: Optional[IndexLabel] = None, |
@@ -300,8 +301,8 @@ def _merger(x, y): |
300 | 301 |
|
301 | 302 |
|
302 | 303 | def merge_asof( |
303 | | - left: "DataFrame", |
304 | | - right: "DataFrame", |
| 304 | + left: DataFrame, |
| 305 | + right: DataFrame, |
305 | 306 | on: Optional[IndexLabel] = None, |
306 | 307 | left_on: Optional[IndexLabel] = None, |
307 | 308 | right_on: Optional[IndexLabel] = None, |
@@ -717,12 +718,12 @@ def get_result(self): |
717 | 718 |
|
718 | 719 | return result.__finalize__(self, method="merge") |
719 | 720 |
|
720 | | - def _maybe_drop_cross_column(self, result: "DataFrame", cross_col: Optional[str]): |
| 721 | + def _maybe_drop_cross_column(self, result: DataFrame, cross_col: Optional[str]): |
721 | 722 | if cross_col is not None: |
722 | 723 | result.drop(columns=cross_col, inplace=True) |
723 | 724 |
|
724 | 725 | def _indicator_pre_merge( |
725 | | - self, left: "DataFrame", right: "DataFrame" |
| 726 | + self, left: DataFrame, right: DataFrame |
726 | 727 | ) -> Tuple["DataFrame", "DataFrame"]: |
727 | 728 |
|
728 | 729 | columns = left.columns.union(right.columns) |
@@ -1230,7 +1231,7 @@ def _maybe_coerce_merge_keys(self): |
1230 | 1231 | self.right = self.right.assign(**{name: self.right[name].astype(typ)}) |
1231 | 1232 |
|
1232 | 1233 | def _create_cross_configuration( |
1233 | | - self, left: "DataFrame", right: "DataFrame" |
| 1234 | + self, left: DataFrame, right: DataFrame |
1234 | 1235 | ) -> Tuple["DataFrame", "DataFrame", str, str]: |
1235 | 1236 | """ |
1236 | 1237 | Creates the configuration to dispatch the cross operation to inner join, |
@@ -1546,8 +1547,8 @@ class _OrderedMerge(_MergeOperation): |
1546 | 1547 |
|
1547 | 1548 | def __init__( |
1548 | 1549 | self, |
1549 | | - left: "DataFrame", |
1550 | | - right: "DataFrame", |
| 1550 | + left: DataFrame, |
| 1551 | + right: DataFrame, |
1551 | 1552 | on: Optional[IndexLabel] = None, |
1552 | 1553 | left_on: Optional[IndexLabel] = None, |
1553 | 1554 | right_on: Optional[IndexLabel] = None, |
@@ -1640,8 +1641,8 @@ class _AsOfMerge(_OrderedMerge): |
1640 | 1641 |
|
1641 | 1642 | def __init__( |
1642 | 1643 | self, |
1643 | | - left: "DataFrame", |
1644 | | - right: "DataFrame", |
| 1644 | + left: DataFrame, |
| 1645 | + right: DataFrame, |
1645 | 1646 | on: Optional[IndexLabel] = None, |
1646 | 1647 | left_on: Optional[IndexLabel] = None, |
1647 | 1648 | right_on: Optional[IndexLabel] = None, |
|
0 commit comments