summaryrefslogtreecommitdiff
path: root/numpy/lib/npyio.py
diff options
context:
space:
mode:
authorYaron de Leeuw <jarondl@server.fake>2014-03-03 20:17:57 +0200
committerYaron de Leeuw <jarondl@server.fake>2014-03-03 20:17:57 +0200
commit479437d295edde0158cff805c40fe3e5a17d3954 (patch)
tree37b498cc3aeb6e74e949de4c807e79ef27878cf4 /numpy/lib/npyio.py
parentd4c7c3a69a0dc2458c876dd17a15b1a18b179fd8 (diff)
downloadnumpy-479437d295edde0158cff805c40fe3e5a17d3954.tar.gz
DOC: add missing parameters to npyio.genfromtxt, fix #2929
`loose` `missing` and `skiprows` were missing from the docstring of `npyio.genfromtxt`. The later two are actualy deprecated, but were added nonetheless.
Diffstat (limited to 'numpy/lib/npyio.py')
-rw-r--r--numpy/lib/npyio.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py
index 2310b9be2..2e29d74f3 100644
--- a/numpy/lib/npyio.py
+++ b/numpy/lib/npyio.py
@@ -1199,14 +1199,20 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None,
The string used to separate values. By default, any consecutive
whitespaces act as delimiter. An integer or sequence of integers
can also be provided as width(s) of each field.
+ skip_rows : int, optional
+ `skip_rows` was deprecated in numpy 1.5, and will be removed in
+ numpy 2.0. Please use `skip_header` instead.
skip_header : int, optional
The numbers of lines to skip at the beginning of the file.
skip_footer : int, optional
- The numbers of lines to skip at the end of the file
+ The numbers of lines to skip at the end of the file.
converters : variable, optional
The set of functions that convert the data of a column to a value.
The converters can also be used to provide a default value
for missing data: ``converters = {3: lambda s: float(s or 0)}``.
+ missing : variable, optional
+ `missing` was deprecated in numpy 1.5, and will be removed in
+ numpy 2.0. Please use `missing_values` instead.
missing_values : variable, optional
The set of strings corresponding to missing data.
filling_values : variable, optional
@@ -1244,6 +1250,8 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None,
usemask : bool, optional
If True, return a masked array.
If False, return a regular array.
+ loose : bool, optional
+ If True, do not raise errors for invalid values.
invalid_raise : bool, optional
If True, an exception is raised if an inconsistency is detected in the
number of columns.