diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-09-30 13:40:43 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-10-01 09:43:10 -0600 |
| commit | 90a54f4683926ffbe158f0d0ace76cf6a6a3bee3 (patch) | |
| tree | 0ff3db3e00e014cee4d1ea798104aa99d5cccb9b | |
| parent | d4160e319acf29c383285f89818500a1fa900613 (diff) | |
| download | numpy-90a54f4683926ffbe158f0d0ace76cf6a6a3bee3.tar.gz | |
BUG: Remove floor_divide support for timedelta64 // timedelta64
| -rw-r--r-- | numpy/core/code_generators/generate_umath.py | 2 | ||||
| -rw-r--r-- | numpy/core/src/umath/loops.h.src | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_datetime.py | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/numpy/core/code_generators/generate_umath.py b/numpy/core/code_generators/generate_umath.py index 8864ab27e..052947e37 100644 --- a/numpy/core/code_generators/generate_umath.py +++ b/numpy/core/code_generators/generate_umath.py @@ -287,7 +287,7 @@ defdict = { TD(intfltcmplx), [TypeDescription('m', FullTypeDescr, 'mq', 'm'), TypeDescription('m', FullTypeDescr, 'md', 'm'), - TypeDescription('m', FullTypeDescr, 'mm', 'd'), + #TypeDescription('m', FullTypeDescr, 'mm', 'd'), ], TD(O, f='PyNumber_FloorDivide'), ), diff --git a/numpy/core/src/umath/loops.h.src b/numpy/core/src/umath/loops.h.src index 24e5ef9fc..24b21aa8d 100644 --- a/numpy/core/src/umath/loops.h.src +++ b/numpy/core/src/umath/loops.h.src @@ -497,7 +497,7 @@ TIMEDELTA_mm_d_divide(char **args, intp *dimensions, intp *steps, void *NPY_UNUS #define TIMEDELTA_mm_d_true_divide TIMEDELTA_mm_d_divide #define TIMEDELTA_mq_m_floor_divide TIMEDELTA_mq_m_divide #define TIMEDELTA_md_m_floor_divide TIMEDELTA_md_m_divide -#define TIMEDELTA_mm_d_floor_divide TIMEDELTA_mm_d_divide +/* #define TIMEDELTA_mm_d_floor_divide TIMEDELTA_mm_d_divide */ #define TIMEDELTA_fmin TIMEDELTA_minimum #define TIMEDELTA_fmax TIMEDELTA_maximum #define DATETIME_fmin DATETIME_minimum diff --git a/numpy/core/tests/test_datetime.py b/numpy/core/tests/test_datetime.py index ec76ed199..4dab25300 100644 --- a/numpy/core/tests/test_datetime.py +++ b/numpy/core/tests/test_datetime.py @@ -926,12 +926,13 @@ class TestDateTime(TestCase): assert_equal(tda / tdb, 6.0 / 9.0) assert_equal(np.divide(tda, tdb), 6.0 / 9.0) assert_equal(np.true_divide(tda, tdb), 6.0 / 9.0) - assert_equal(np.floor_divide(tda, tdb), 6.0 / 9.0) assert_equal(tdb / tda, 9.0 / 6.0) assert_equal((tda / tdb).dtype, np.dtype('f8')) assert_equal(tda / tdd, 60.0) assert_equal(tdd / tda, 1.0 / 60.0) + # m8 // m8 + assert_raises(TypeError, np.floor_divide, tda, tdb) # int / m8 assert_raises(TypeError, np.divide, 2, tdb) # float / m8 |