Skip to content

Commit 69f3fa4

Browse files
committed
COMPAT: numpy-dev compat on bool(dtype) change
xref numpy/numpy#8279 closes pandas-dev#15199
1 parent be3f2ae commit 69f3fa4

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

pandas/core/ops.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -444,13 +444,15 @@ def _convert_to_array(self, values, name=None, other=None):
444444
supplied_dtype = None
445445
if not is_list_like(values):
446446
values = np.array([values])
447+
447448
# if this is a Series that contains relevant dtype info, then use this
448449
# instead of the inferred type; this avoids coercing Series([NaT],
449450
# dtype='datetime64[ns]') to Series([NaT], dtype='timedelta64[ns]')
450451
elif (isinstance(values, pd.Series) and
451452
(is_timedelta64_dtype(values) or is_datetime64_dtype(values))):
452453
supplied_dtype = values.dtype
453-
inferred_type = supplied_dtype or lib.infer_dtype(values)
454+
455+
inferred_type = lib.infer_dtype(values)
454456
if (inferred_type in ('datetime64', 'datetime', 'date', 'time') or
455457
is_datetimetz(inferred_type)):
456458
# if we have a other of timedelta, but use pd.NaT here we

0 commit comments

Comments
 (0)