diff options
| author | Stephan Hoyer <shoyer@google.com> | 2019-05-13 08:09:26 -0700 |
|---|---|---|
| committer | Stephan Hoyer <shoyer@google.com> | 2019-05-13 08:09:26 -0700 |
| commit | 07452c86c78a1cf213a764d17f060b4887ec3681 (patch) | |
| tree | 12c7ae7b14552bd28334277e7e244b603ca4300a /numpy/lib/npyio.py | |
| parent | 804f71bb42fef775a85a52366dc4bd1a22c130a8 (diff) | |
| parent | 4ad33d21b1a30f931e23307e9f9355b70f633bed (diff) | |
| download | numpy-07452c86c78a1cf213a764d17f060b4887ec3681.tar.gz | |
Merge branch 'master' into implement-numpy-implementation
Diffstat (limited to 'numpy/lib/npyio.py')
| -rw-r--r-- | numpy/lib/npyio.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index ed2e26aac..694ad1694 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -1399,7 +1399,7 @@ def savetxt(fname, X, fmt='%.18e', delimiter=' ', newline='\n', header='', if len(fmt) != ncol: raise AttributeError('fmt has wrong shape. %s' % str(fmt)) format = asstr(delimiter).join(map(asstr, fmt)) - elif isinstance(fmt, str): + elif isinstance(fmt, basestring): n_fmt_chars = fmt.count('%') error = ValueError('fmt has wrong number of %% formats: %s' % fmt) if n_fmt_chars == 1: @@ -1549,7 +1549,8 @@ def fromregex(file, regexp, dtype, encoding=None): def genfromtxt(fname, dtype=float, comments='#', delimiter=None, skip_header=0, skip_footer=0, converters=None, missing_values=None, filling_values=None, usecols=None, - names=None, excludelist=None, deletechars=None, + names=None, excludelist=None, + deletechars=''.join(sorted(NameValidator.defaultdeletechars)), replace_space='_', autostrip=False, case_sensitive=True, defaultfmt="f%i", unpack=None, usemask=False, loose=True, invalid_raise=True, max_rows=None, encoding='bytes'): |