diff options
| author | njsmith <njs@pobox.com> | 2012-10-25 15:16:11 -0700 |
|---|---|---|
| committer | njsmith <njs@pobox.com> | 2012-10-25 15:16:11 -0700 |
| commit | a890a8584319c2978735eef96ecaefefacad6346 (patch) | |
| tree | 087a0e5af54733525e9e34c947fa10bc2d752f52 /numpy/core/numeric.py | |
| parent | c5ccca92c5f136833ad85614feb2aa4f5bd8b7c3 (diff) | |
| parent | 02ebf8b3e7674a6b8a06636feaa6c761fcdf4e2d (diff) | |
| download | numpy-a890a8584319c2978735eef96ecaefefacad6346.tar.gz | |
Merge pull request #2694 from seberg/cflags2
ENH: Make 1-dimensional axes not matter for contiguous flags
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 5f0474d3e..0d0babbac 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -538,7 +538,7 @@ def require(a, dtype=None, requirements=None): def isfortran(a): """ Returns True if array is arranged in Fortran-order in memory - and dimension > 1. + and not C-order. Parameters ---------- @@ -584,7 +584,7 @@ def isfortran(a): >>> np.isfortran(b) True - 1-D arrays always evaluate as False. + C-ordered arrays evaluate as False even if they are also FORTRAN-ordered. >>> np.isfortran(np.array([1, 2], order='FORTRAN')) False |