Skip to content

Commit 03afdf2

Browse files
committed
BUG: mergeasof() now accepts datetime.timedelta as tolerance kwarg (#28098)
1 parent 229b499 commit 03afdf2

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

pandas/core/reshape/merge.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,8 +1712,6 @@ def flip(xs):
17121712
except AttributeError:
17131713
# datetime.timedelta(microseconds=1) == min resolution, cvt to nano
17141714
tolerance = (tolerance / datetime.timedelta(microseconds=1)) * 1000
1715-
else:
1716-
raise ValueError(msg_tolerance.format(t=type(tolerance)))
17171715

17181716
# a "by" parameter requires special handling
17191717
if self.left_by is not None:

0 commit comments

Comments
 (0)