Skip to content

Commit 49feb15

Browse files
committed
COMPAT: numpy-dev compat on bool(dtype) change
This is >= 1.13 xref numpy/numpy#8279 closes pandas-dev#15199
1 parent be3f2ae commit 49feb15

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

pandas/compat/numpy/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
_np_version_under1p10 = _nlv < '1.10'
1515
_np_version_under1p11 = _nlv < '1.11'
1616
_np_version_under1p12 = _nlv < '1.12'
17+
_np_version_under1p13 = _nlv < '1.13'
1718

1819
if _nlv < '1.7.0':
1920
raise ImportError('this version of pandas is incompatible with '

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

pandas/tseries/index.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ def _simple_new(cls, values, name=None, freq=None, tz=None,
557557
if we are passed a non-dtype compat, then coerce using the constructor
558558
"""
559559

560-
if not getattr(values, 'dtype', None):
560+
if getattr(values, 'dtype', None) is None:
561561
# empty, but with dtype compat
562562
if values is None:
563563
values = np.empty(0, dtype=_NS_DTYPE)

pandas/tseries/tdi.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,7 @@ def _box_func(self):
272272

273273
@classmethod
274274
def _simple_new(cls, values, name=None, freq=None, **kwargs):
275-
if not getattr(values, 'dtype', None):
276-
values = np.array(values, copy=False)
275+
values = np.array(values, copy=False)
277276
if values.dtype == np.object_:
278277
values = tslib.array_to_timedelta64(values)
279278
if values.dtype != _TD_DTYPE:

0 commit comments

Comments
 (0)