Skip to content

Commit b07be3c

Browse files
committed
BUG (#28098) some more changes
1 parent 1dcaa63 commit b07be3c

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

pandas/core/reshape/merge.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,7 @@
3939
)
4040
from pandas.core.dtypes.missing import isnull, na_value_for_dtype
4141

42-
from pandas import (
43-
Categorical,
44-
DataFrame,
45-
Index,
46-
MultiIndex,
47-
Series,
48-
Timedelta,
49-
to_timedelta,
50-
)
42+
from pandas import Categorical, DataFrame, Index, MultiIndex, Series, Timedelta
5143
import pandas.core.algorithms as algos
5244
from pandas.core.arrays.categorical import _recode_for_categories
5345
import pandas.core.common as com
@@ -1715,7 +1707,7 @@ def flip(xs):
17151707
right_values = right_values.view("i8")
17161708
if tolerance is not None:
17171709
if not isinstance(self.tolerance, Timedelta):
1718-
tolerance = to_timedelta(tolerance)
1710+
tolerance = Timedelta(tolerance)
17191711
tolerance = tolerance.value
17201712

17211713
# a "by" parameter requires special handling

0 commit comments

Comments
 (0)