diff options
author | Peter Andreas Entschev <peter@entschev.com> | 2020-11-16 10:19:39 -0800 |
---|---|---|
committer | Peter Andreas Entschev <peter@entschev.com> | 2020-11-16 10:19:39 -0800 |
commit | adc261a50b11310c97ffbcf57d6e20a5980bfed9 (patch) | |
tree | 0ac71fd30678263d9a240a70cba7f30297123a62 /numpy/lib/npyio.py | |
parent | e0c9b265e171e92ee558c00712d1104e68f65c9b (diff) | |
download | numpy-adc261a50b11310c97ffbcf57d6e20a5980bfed9.tar.gz |
MAINT: Make like= in Python functions strict
Only allow objects that implement __array_function__
Diffstat (limited to 'numpy/lib/npyio.py')
-rw-r--r-- | numpy/lib/npyio.py | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index 805e59bc1..f6b82dbd3 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -14,7 +14,9 @@ from . import format from ._datasource import DataSource from numpy.core import overrides from numpy.core.multiarray import packbits, unpackbits -from numpy.core.overrides import set_array_function_like_doc, set_module +from numpy.core.overrides import ( + array_function_dispatch_like, set_array_function_like_doc, set_module + ) from numpy.core._internal import recursive from ._iotools import ( LineSplitter, NameValidator, StringConverter, ConverterError, @@ -899,10 +901,10 @@ def loadtxt(fname, dtype=float, comments='#', delimiter=None, """ if like is not None: - return _loadtxt_with_like( - fname, dtype=dtype, comments=comments, delimiter=delimiter, - converters=converters, skiprows=skiprows, usecols=usecols, - unpack=unpack, ndmin=ndmin, encoding=encoding, + return array_function_dispatch_like( + _loadtxt_with_like, fname, dtype=dtype, comments=comments, + delimiter=delimiter, converters=converters, skiprows=skiprows, + usecols=usecols, unpack=unpack, ndmin=ndmin, encoding=encoding, max_rows=max_rows, like=like ) @@ -1751,15 +1753,15 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None, """ if like is not None: - return _genfromtxt_with_like( - fname, dtype=dtype, comments=comments, delimiter=delimiter, - skip_header=skip_header, skip_footer=skip_footer, - converters=converters, missing_values=missing_values, - filling_values=filling_values, usecols=usecols, names=names, - excludelist=excludelist, deletechars=deletechars, - replace_space=replace_space, autostrip=autostrip, - case_sensitive=case_sensitive, defaultfmt=defaultfmt, - unpack=unpack, usemask=usemask, loose=loose, + return array_function_dispatch_like( + _genfromtxt_with_like, fname, dtype=dtype, comments=comments, + delimiter=delimiter, skip_header=skip_header, + skip_footer=skip_footer, converters=converters, + missing_values=missing_values, filling_values=filling_values, + usecols=usecols, names=names, excludelist=excludelist, + deletechars=deletechars, replace_space=replace_space, + autostrip=autostrip, case_sensitive=case_sensitive, + defaultfmt=defaultfmt, unpack=unpack, usemask=usemask, loose=loose, invalid_raise=invalid_raise, max_rows=max_rows, encoding=encoding, like=like ) |