Skip to content

Commit

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


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)


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

0 comments on commit a3d6fe6

Please sign in to comment.