Skip to content

Commit

Permalink
remove some pass statements
Browse files Browse the repository at this point in the history
  • Loading branch information
reidy-p committed Nov 22, 2017
1 parent fc8ac2c commit c46875b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pandas/core/reshape/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -920,15 +920,15 @@ def _maybe_coerce_merge_keys(self):
'columns where the float values '
'are not equal to their int '
'representation', UserWarning)
pass


elif is_float_dtype(rk) and is_integer_dtype(lk):
if not (rk == rk.astype(lk.dtype)).all():
warnings.warn('You are merging on int and float '
'columns where the float values '
'are not equal to their int '
'representation', UserWarning)
pass


# let's infer and see if we are ok
elif lib.infer_dtype(lk) == lib.infer_dtype(rk):
Expand Down

0 comments on commit c46875b

Please sign in to comment.