diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2016-01-05 16:28:28 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2016-01-05 16:28:28 -0700 |
| commit | debc9533727cba327a2e729c8a72f47564b1cb0f (patch) | |
| tree | eecd593293c2b9e4ad3cf5c3f2715614d11e4fe2 /numpy/core | |
| parent | 10361d1fb298dd990433d097ee00b6010b9fc3a9 (diff) | |
| parent | 029b502bf4946b2b0943fed1ccbb6dadd7bcc394 (diff) | |
| download | numpy-debc9533727cba327a2e729c8a72f47564b1cb0f.tar.gz | |
Merge pull request #6942 from mwiebe/modprec
Fix datetime roll='modifiedpreceding' bug
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/src/multiarray/datetime_busday.c | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_datetime.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/datetime_busday.c b/numpy/core/src/multiarray/datetime_busday.c index 331e10496..4fade4d20 100644 --- a/numpy/core/src/multiarray/datetime_busday.c +++ b/numpy/core/src/multiarray/datetime_busday.c @@ -889,7 +889,7 @@ PyArray_BusDayRollConverter(PyObject *roll_in, NPY_BUSDAY_ROLL *roll) break; case 'p': if (strcmp(str, "modifiedpreceding") == 0) { - *roll = NPY_BUSDAY_MODIFIEDFOLLOWING; + *roll = NPY_BUSDAY_MODIFIEDPRECEDING; goto finish; } break; diff --git a/numpy/core/tests/test_datetime.py b/numpy/core/tests/test_datetime.py index 563aa48fb..8a8eafee8 100644 --- a/numpy/core/tests/test_datetime.py +++ b/numpy/core/tests/test_datetime.py @@ -1524,6 +1524,12 @@ class TestDateTime(TestCase): assert_equal( np.busday_offset('2010-10-30', 0, roll='modifiedpreceding'), np.datetime64('2010-10-29')) + assert_equal( + np.busday_offset('2010-10-16', 0, roll='modifiedfollowing'), + np.datetime64('2010-10-18')) + assert_equal( + np.busday_offset('2010-10-16', 0, roll='modifiedpreceding'), + np.datetime64('2010-10-15')) # roll='raise' by default assert_raises(ValueError, np.busday_offset, '2011-06-04', 0) |