summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-03-04 16:10:12 -0700
committerCharles Harris <charlesr.harris@gmail.com>2014-03-04 16:10:12 -0700
commit64694a56a203fe0d5ef5ad3d437f1dc5a0ca6a85 (patch)
tree52e37322baea3a28479f054c979f91403daf0d9c
parent91fa07e8ec35f613c83afb7bbdcfb8bf9e7861ec (diff)
parent6030f096a34e6bbd6a504b6e4d5f6773a3c54b6e (diff)
downloadnumpy-64694a56a203fe0d5ef5ad3d437f1dc5a0ca6a85.tar.gz
Merge pull request #4428 from jarondl/genfromtxt-doc
DOC: add missing parameters to npyio.genfromtxt, fix #2929
-rw-r--r--numpy/lib/npyio.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py
index 2310b9be2..4268e6f06 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.
+ The number 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 number 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.