Skip to content

Commit 5c5acd1

Browse files
committed
BUG: Ignore division by 0 when merging empty dataframes (pandas-dev#17776)
1 parent 3c964a4 commit 5c5acd1

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

pandas/core/reshape/merge.py

+2
Original file line numberDiff line numberDiff line change
@@ -1514,6 +1514,7 @@ def _sort_labels(uniques, left, right):
15141514

15151515

15161516
def _get_join_keys(llab, rlab, shape, sort):
1517+
np.seterr(divide='ignore')
15171518

15181519
# how many levels can be done without overflow
15191520
pred = lambda i: not is_int64_overflow_possible(shape[:i])
@@ -1528,6 +1529,7 @@ def _get_join_keys(llab, rlab, shape, sort):
15281529
stride //= shape[i]
15291530
lkey += llab[i] * stride
15301531
rkey += rlab[i] * stride
1532+
np.seterr(divide='warn')
15311533

15321534
if nlev == len(shape): # all done!
15331535
return lkey, rkey

0 commit comments

Comments
 (0)