From ae2d0bb7c2d227e893195cc3e52477567781e2db Mon Sep 17 00:00:00 2001 From: jason king Date: Sat, 5 Sep 2015 23:01:24 +1000 Subject: DOC: Update docs for numpy.genfromtxt. Note that a list of strings can be passed as the first parameter. The strings are treated as the lines in a file. Closes #6247 --- numpy/lib/npyio.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'numpy/lib/npyio.py') diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index 12052a08e..9f90039eb 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -1271,10 +1271,12 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None, Parameters ---------- - fname : file or str - File, filename, or generator to read. If the filename extension is + fname : file, str, list of str + File, filename, list, or generator to read. If the filename extension is `.gz` or `.bz2`, the file is first decompressed. Note that generators must return byte strings in Python 3k. + The strings in a list or strings produced by a generator are treated + as lines. dtype : dtype, optional Data type of the resulting array. If None, the dtypes will be determined by the contents of each @@ -1455,7 +1457,7 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None, fhd = iter(fname) except TypeError: raise TypeError( - "fname must be a string, filehandle, or generator. " + "fname must be a string, filehandle, list of strings, or generator. " "(got %s instead)" % type(fname)) split_line = LineSplitter(delimiter=delimiter, comments=comments, -- cgit v1.2.1