Skip to content

Commit

Permalink
mod
Browse files Browse the repository at this point in the history
  • Loading branch information
sinhrks committed Sep 11, 2016
1 parent a60d410 commit 8c1af58
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions pandas/core/internals.py
Original file line number Diff line number Diff line change
Expand Up @@ -1669,7 +1669,7 @@ def fillna(self, value, **kwargs):

# allow filling with integers to be
# interpreted as seconds
if not isinstance(value, np.timedelta64):
if not isinstance(value, np.timedelta64) and is_integer(value):
value = Timedelta(value, unit='s')
return super(TimeDeltaBlock, self).fillna(value, **kwargs)

Expand Down Expand Up @@ -1710,9 +1710,7 @@ def _try_coerce_args(self, values, other):
other = other.astype('i8', copy=False).view('i8')
else:
# scalar
other = Timedelta(other)
other_mask = isnull(other)
other = other.value
raise TypeError

return values, values_mask, other, other_mask

Expand Down

0 comments on commit 8c1af58

Please sign in to comment.