10000 Backport 6942 by charris · Pull Request #6945 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

Backport 6942 #6945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 6, 2016
Merged

Backport 6942 #6945

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99d28b9
TST: Add datetime test distinguishing modified following from preceding
mwiebe Jan 5, 2016
f5dc97e
BUG: Fix copy/paste error treating modifiedpreceding as modifiedfollo…
mwiebe Jan 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
BUG: Fix copy/paste error treating modifiedpreceding as modifiedfollo… 
…wing
  • Loading branch information
@mwiebe @charris
mwiebe authored and charris committed Jan 5, 2016
commit f5dc97e8fa6667b96b8192948b5bb1e53f25ea24
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/datetime_busday.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0