diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-06-21 18:07:06 -0400 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-06-21 18:07:06 -0400 |
| commit | f0c898b6017cc011561d7f1e611e08283ecfdb08 (patch) | |
| tree | 4406a2c8d1cad085eeacbd09be3947a9bf97aa2e /numpy/core/numeric.py | |
| parent | 23e6b74a74857136a0fd2919f4d37da370d55ec4 (diff) | |
| parent | 4e5545f0bcc654fb0c6752dcf72120e6e7340d28 (diff) | |
| download | numpy-f0c898b6017cc011561d7f1e611e08283ecfdb08.tar.gz | |
Merge pull request #5490 from charris/cleanup-gh-4986
DOC: Update indexing docs.
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 35a6deaff..f29b750f6 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -398,8 +398,7 @@ matmul = multiarray.matmul def asarray(a, dtype=None, order=None): - """ - Convert the input to an array. + """Convert the input to an array. Parameters ---------- @@ -410,8 +409,9 @@ def asarray(a, dtype=None, order=None): dtype : data-type, optional By default, the data-type is inferred from the input data. order : {'C', 'F'}, optional - Whether to use row-major ('C') or column-major ('F' for FORTRAN) - memory representation. Defaults to 'C'. + Whether to use row-major (C-style) or + column-major (Fortran-style) memory representation. + Defaults to 'C'. Returns ------- @@ -468,8 +468,7 @@ def asarray(a, dtype=None, order=None): return array(a, dtype, copy=False, order=order) def asanyarray(a, dtype=None, order=None): - """ - Convert the input to an ndarray, but pass ndarray subclasses through. + """Convert the input to an ndarray, but pass ndarray subclasses through. Parameters ---------- @@ -480,8 +479,8 @@ def asanyarray(a, dtype=None, order=None): dtype : data-type, optional By default, the data-type is inferred from the input data. order : {'C', 'F'}, optional - Whether to use row-major ('C') or column-major ('F') memory - representation. Defaults to 'C'. + Whether to use row-major (C-style) or column-major + (Fortran-style) memory representation. Defaults to 'C'. Returns ------- |