diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2012-01-21 18:01:23 -0800 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2012-01-21 18:14:31 -0800 |
| commit | aea993c4a36cf91f93e31fcf2cdbfa0843e787b0 (patch) | |
| tree | 3ea534346663572ceb1178cf1b8a2f327e927325 | |
| parent | 2f9ed8dc99f4553c4a1f9a670ca31354b61399a7 (diff) | |
| download | numpy-aea993c4a36cf91f93e31fcf2cdbfa0843e787b0.tar.gz | |
BUG: Change nditer to match documentation about grow_inner flag
| -rw-r--r-- | numpy/core/src/multiarray/nditer_pywrap.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/nditer_pywrap.c b/numpy/core/src/multiarray/nditer_pywrap.c index e70ef3e09..db6d113f4 100644 --- a/numpy/core/src/multiarray/nditer_pywrap.c +++ b/numpy/core/src/multiarray/nditer_pywrap.c @@ -170,7 +170,12 @@ NpyIter_GlobalFlagsConverter(PyObject *flags_in, npy_uint32 *flags) } break; case 'g': - if (strcmp(str, "growinner") == 0) { + /* + * Documentation is grow_inner, but initial implementation + * was growinner, so allowing for either. + */ + if (strcmp(str, "grow_inner") == 0 || + strcmp(str, "growinner") == 0) { flag = NPY_ITER_GROWINNER; } break; |