From 3651aaee130215dde9584e95f1676395deefe83f Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Wed, 10 Jan 2018 18:29:12 -0800 Subject: [PATCH] remove unreachable states, assert they are unreachable just in case --- pandas/core/internals.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pandas/core/internals.py b/pandas/core/internals.py index ba90503e3bf40..5a4778ae4e629 100644 --- a/pandas/core/internals.py +++ b/pandas/core/internals.py @@ -2933,10 +2933,8 @@ def make_block(values, placement, klass=None, ndim=None, dtype=None, elif dtype == np.bool_: klass = BoolBlock elif issubclass(vtype, np.datetime64): - if hasattr(values, 'tz'): - klass = DatetimeTZBlock - else: - klass = DatetimeBlock + assert not hasattr(values, 'tz') + klass = DatetimeBlock elif is_datetimetz(values): klass = DatetimeTZBlock elif issubclass(vtype, np.complexfloating): @@ -4696,10 +4694,8 @@ def form_blocks(arrays, names, axes): if v.dtype != _NS_DTYPE: v = conversion.ensure_datetime64ns(v) - if is_datetimetz(v): - datetime_tz_items.append((i, k, v)) - else: - datetime_items.append((i, k, v)) + assert not is_datetimetz(v) + datetime_items.append((i, k, v)) elif is_datetimetz(v): datetime_tz_items.append((i, k, v)) elif issubclass(v.dtype.type, np.integer):