Skip to content

Commit 600e7f9

Browse files
committed
COMPAT: don't rely on dtype being False after numpy >= 1.13
closes pandas-dev#15199
1 parent be3f2ae commit 600e7f9

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

pandas/core/ops.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -441,21 +441,17 @@ def _convert_to_array(self, values, name=None, other=None):
441441
from pandas.tseries.timedeltas import to_timedelta
442442

443443
ovalues = values
444-
supplied_dtype = None
445444
if not is_list_like(values):
446445
values = np.array([values])
447446
# if this is a Series that contains relevant dtype info, then use this
448447
# instead of the inferred type; this avoids coercing Series([NaT],
449448
# dtype='datetime64[ns]') to Series([NaT], dtype='timedelta64[ns]')
450-
elif (isinstance(values, pd.Series) and
451-
(is_timedelta64_dtype(values) or is_datetime64_dtype(values))):
452-
supplied_dtype = values.dtype
453-
inferred_type = supplied_dtype or lib.infer_dtype(values)
449+
inferred_type = lib.infer_dtype(values)
454450
if (inferred_type in ('datetime64', 'datetime', 'date', 'time') or
455451
is_datetimetz(inferred_type)):
456452
# if we have a other of timedelta, but use pd.NaT here we
457453
# we are in the wrong path
458-
if (supplied_dtype is None and other is not None and
454+
if (other is not None and
459455
(other.dtype in ('timedelta64[ns]', 'datetime64[ns]')) and
460456
isnull(values).all()):
461457
values = np.empty(values.shape, dtype='timedelta64[ns]')

0 commit comments

Comments
 (0)