Skip to content

Commit 8c1af58

Browse files
committed
mod
1 parent a60d410 commit 8c1af58

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

Diff for: pandas/core/internals.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ def fillna(self, value, **kwargs):
16691669

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

@@ -1710,9 +1710,7 @@ def _try_coerce_args(self, values, other):
17101710
other = other.astype('i8', copy=False).view('i8')
17111711
else:
17121712
# scalar
1713-
other = Timedelta(other)
1714-
other_mask = isnull(other)
1715-
other = other.value
1713+
raise TypeError
17161714

17171715
return values, values_mask, other, other_mask
17181716

0 commit comments

Comments
 (0)