diff options
| author | Mark Wiebe <mwiebe@enthought.com> | 2011-07-26 12:14:21 -0500 |
|---|---|---|
| committer | Mark Wiebe <mwiebe@enthought.com> | 2011-07-26 12:14:21 -0500 |
| commit | 9163993794f1bc56c279ab3d90796370d6b579c4 (patch) | |
| tree | f5a40b3c0ca60bf9d7a645073e0600e36ccdd60f /numpy/lib/npyio.py | |
| parent | 1b62bdfb04e56f75fc61dbbd1f2600a72951b19d (diff) | |
| parent | affea42d886e8233fdd6f3c5760708e3a9e9b1b8 (diff) | |
| download | numpy-9163993794f1bc56c279ab3d90796370d6b579c4.tar.gz | |
Merge branch 'deprecate_array_field_access'
Diffstat (limited to 'numpy/lib/npyio.py')
| -rw-r--r-- | numpy/lib/npyio.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index 13f659d70..f7cde270d 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -627,7 +627,7 @@ def loadtxt(fname, dtype=float, comments='#', delimiter=None, data-type, arrays are returned for each field. Default is False. ndmin : int, optional The returned array will have at least `ndmin` dimensions. - Otherwise mono-dimensional axes will be squeezed. + Otherwise mono-dimensional axes will be squeezed. Legal values: 0 (default), 1 or 2. .. versionadded:: 1.6.0 @@ -803,7 +803,7 @@ def loadtxt(fname, dtype=float, comments='#', delimiter=None, fh.close() X = np.array(X, dtype) - # Multicolumn data are returned with shape (1, N, M), i.e. + # Multicolumn data are returned with shape (1, N, M), i.e. # (1, 1, M) for a single row - remove the singleton dimension there if X.ndim == 3 and X.shape[:2] == (1, 1): X.shape = (1, -1) |