added is_datetime64tz_dtype and changed evaluation from 'values' to dtype
This commit is contained in:
parent
19eecb280c
commit
5d37ce8647
|
@ -10,8 +10,8 @@ import pandas.lib as lib
|
|||
from pandas.compat import range, string_types
|
||||
from pandas.types.common import (is_numeric_v_string_like,
|
||||
is_float_dtype, is_datetime64_dtype,
|
||||
is_integer_dtype, _ensure_float64,
|
||||
is_scalar,
|
||||
is_datetime64tz_dtype, is_integer_dtype,
|
||||
_ensure_float64, is_scalar,
|
||||
_DATELIKE_DTYPES,
|
||||
needs_i8_conversion)
|
||||
from pandas.types.missing import isnull
|
||||
|
@ -450,7 +450,7 @@ def pad_1d(values, limit=None, mask=None, dtype=None):
|
|||
_method = None
|
||||
if is_float_dtype(values):
|
||||
_method = getattr(algos, 'pad_inplace_%s' % dtype.name, None)
|
||||
elif dtype in _DATELIKE_DTYPES or is_datetime64_dtype(values):
|
||||
elif is_datetime64_dtype(dtype) or is_datetime64tz_dtype(dtype):
|
||||
_method = _pad_1d_datetime
|
||||
elif is_integer_dtype(values):
|
||||
values = _ensure_float64(values)
|
||||
|
@ -475,7 +475,7 @@ def backfill_1d(values, limit=None, mask=None, dtype=None):
|
|||
_method = None
|
||||
if is_float_dtype(values):
|
||||
_method = getattr(algos, 'backfill_inplace_%s' % dtype.name, None)
|
||||
elif dtype in _DATELIKE_DTYPES or is_datetime64_dtype(values):
|
||||
elif is_datetime64_dtype(dtype) or is_datetime64tz_dtype(dtype):
|
||||
_method = _backfill_1d_datetime
|
||||
elif is_integer_dtype(values):
|
||||
values = _ensure_float64(values)
|
||||
|
@ -501,7 +501,7 @@ def pad_2d(values, limit=None, mask=None, dtype=None):
|
|||
_method = None
|
||||
if is_float_dtype(values):
|
||||
_method = getattr(algos, 'pad_2d_inplace_%s' % dtype.name, None)
|
||||
elif dtype in _DATELIKE_DTYPES or is_datetime64_dtype(values):
|
||||
elif is_datetime64_dtype(dtype) or is_datetime64tz_dtype(dtype):
|
||||
_method = _pad_2d_datetime
|
||||
elif is_integer_dtype(values):
|
||||
values = _ensure_float64(values)
|
||||
|
@ -531,7 +531,7 @@ def backfill_2d(values, limit=None, mask=None, dtype=None):
|
|||
_method = None
|
||||
if is_float_dtype(values):
|
||||
_method = getattr(algos, 'backfill_2d_inplace_%s' % dtype.name, None)
|
||||
elif dtype in _DATELIKE_DTYPES or is_datetime64_dtype(values):
|
||||
elif is_datetime64_dtype(dtype) or is_datetime64tz_dtype(dtype):
|
||||
_method = _backfill_2d_datetime
|
||||
elif is_integer_dtype(values):
|
||||
values = _ensure_float64(values)
|
||||
|
|
Loading…
Reference in New Issue