use datetime64 and timedelta64 to eval

Author: holymonson

pandas/core/common.py

@@ -431,3 +431,11 @@ def _pipe(obj, func, *args, **kwargs):
         return func(*args, **kwargs)
     else:
         return func(obj, *args, **kwargs)
+
+
+# TODO: np.percentile not support datetime64, should be fixed in upsteam.
+def percentile(values, q, **kw):
+    if values.dtype.kind == 'M':
+        return np.percentile(values.view('i8'), q, **kw).astype(values.dtype)
+    else:
+        return np.percentile(values, q, **kw)

pandas/core/internals/blocks.py

@@ -1610,12 +1610,12 @@ def _nanpercentile1D(values, mask, q, **kw):
 
             if len(values) == 0:
                 if lib.is_scalar(q):
-                    return self._na_value
+                    return self.fill_value
                 else:
-                    return np.array([self._na_value] * len(q),
+                    return np.array([self.fill_value] * len(q),
                                     dtype=values.dtype)
 
-            return np.percentile(values, q, **kw)
+            return com.percentile(values, q, **kw)
 
         def _nanpercentile(values, q, axis, **kw):
 
@@ -1635,7 +1635,7 @@ def _nanpercentile(values, q, axis, **kw):
                     result = np.array(result, dtype=values.dtype, copy=False).T
                     return result
             else:
-                return np.percentile(values, q, axis=axis, **kw)
+                return com.percentile(values, q, axis=axis, **kw)
 
         from pandas import Float64Index
         is_empty = values.shape[axis] == 0
@@ -2134,7 +2134,7 @@ def _na_value(self):
 
     @property
     def fill_value(self):
-        return tslibs.iNaT
+        return tslibs.NaT.asm8
 
     def get_values(self, dtype=None):
         """
@@ -2198,25 +2198,21 @@ def _try_coerce_args(self, values, other):
         """
 
         values_mask = isna(values)
-        values = values.view('i8')
         other_mask = False
 
-        if isinstance(other, bool):
-            raise TypeError
-        elif is_null_datelike_scalar(other):
-            other = tslibs.iNaT
+        if is_null_datelike_scalar(other):
+            other = tslibs.NaT.asm8
             other_mask = True
         elif isinstance(other, Timedelta):
             other_mask = isna(other)
-            other = other.value
+            other = other.asm8
         elif isinstance(other, timedelta):
-            other = Timedelta(other).value
-        elif isinstance(other, np.timedelta64):
-            other_mask = isna(other)
-            other = Timedelta(other).value
+            other = np.timedelta64(other)
+        elif isinstance(other, (np.timedelta64, np.ndarray)):
+            pass
         elif hasattr(other, 'dtype') and is_timedelta64_dtype(other):
             other_mask = isna(other)
-            other = other.astype('i8', copy=False).view('i8')
+            other = getattr(other, 'values', other)
         else:
             # coercion issues
             # let higher levels handle
@@ -2698,24 +2694,25 @@ def _try_coerce_args(self, values, other):
         """
 
         values_mask = isna(values)
-        values = values.view('i8')
         other_mask = False
 
-        if isinstance(other, bool):
-            raise TypeError
-        elif is_null_datelike_scalar(other):
-            other = tslibs.iNaT
+        if getattr(other, 'tz', None) is not None:
+            raise TypeError("cannot coerce a Timestamp with a tz on a "
+                            "naive Block")
+
+        if is_null_datelike_scalar(other):
+            other = tslibs.NaT.asm8
             other_mask = True
-        elif isinstance(other, (datetime, np.datetime64, date)):
-            other = self._box_func(other)
-            if getattr(other, 'tz') is not None:
-                raise TypeError("cannot coerce a Timestamp with a tz on a "
-                                "naive Block")
+        elif isinstance(other, tslibs.Timestamp):
             other_mask = isna(other)
-            other = other.asm8.view('i8')
+            other = other.asm8
+        elif isinstance(other, date):
+            other = np.datetime64(other)
+        elif isinstance(other, (np.datetime64, np.ndarray)):
+            pass
         elif hasattr(other, 'dtype') and is_datetime64_dtype(other):
             other_mask = isna(other)
-            other = other.astype('i8', copy=False).view('i8')
+            other = getattr(other, 'values', other)
         else:
             # coercion issues
             # let higher levels handle

pandas/tests/internals/test_internals.py

@@ -308,7 +308,7 @@ def test_try_coerce_arg(self):
                 date(2010, 10, 10))
         for val in vals:
             coerced = block._try_coerce_args(block.values, val)[2]
-            assert np.int64 == type(coerced)
+            assert np.datetime64 == type(coerced)
             assert pd.Timestamp('2010-10-10') == pd.Timestamp(coerced)
 
 
@@ -1250,14 +1250,20 @@ class TestCanHoldElement(object):
     ], ids=lambda x: x.__name__)
     def test_binop_other(self, op, value, dtype):
         skip = {(operator.add, 'bool'),
+                (operator.add, '<M8[ns]'),
                 (operator.sub, 'bool'),
                 (operator.mul, 'bool'),
+                (operator.mul, '<m8[ns]'),
+                (operator.mul, '<M8[ns]'),
                 (operator.truediv, 'bool'),
+                (operator.truediv, '<M8[ns]'),
                 (operator.mod, 'i8'),
                 (operator.mod, 'complex128'),
                 (operator.mod, '<M8[ns]'),
                 (operator.mod, '<m8[ns]'),
-                (operator.pow, 'bool')}
+                (operator.pow, 'bool'),
+                (operator.pow, '<m8[ns]'),
+                (operator.pow, '<M8[ns]')}
         if (op, dtype) in skip:
             pytest.skip("Invalid combination {},{}".format(op, dtype))
         e = DummyElement(value, dtype)