diff options
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/npyio.py | 30 | ||||
| -rw-r--r-- | numpy/lib/twodim_base.py | 18 |
2 files changed, 17 insertions, 31 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index f6b82dbd3..805e59bc1 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -14,9 +14,7 @@ from . import format from ._datasource import DataSource from numpy.core import overrides from numpy.core.multiarray import packbits, unpackbits -from numpy.core.overrides import ( - array_function_dispatch_like, set_array_function_like_doc, set_module - ) +from numpy.core.overrides import set_array_function_like_doc, set_module from numpy.core._internal import recursive from ._iotools import ( LineSplitter, NameValidator, StringConverter, ConverterError, @@ -901,10 +899,10 @@ def loadtxt(fname, dtype=float, comments='#', delimiter=None, """ if like is not None: - 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, + return _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 ) @@ -1753,15 +1751,15 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None, """ if like is not None: - 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, + 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, invalid_raise=invalid_raise, max_rows=max_rows, encoding=encoding, like=like ) diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py index 099fb2960..2b4cbdfbb 100644 --- a/numpy/lib/twodim_base.py +++ b/numpy/lib/twodim_base.py @@ -8,9 +8,7 @@ from numpy.core.numeric import ( asarray, where, int8, int16, int32, int64, empty, promote_types, diagonal, nonzero ) -from numpy.core.overrides import ( - array_function_dispatch_like, set_array_function_like_doc, set_module - ) +from numpy.core.overrides import set_array_function_like_doc, set_module from numpy.core import overrides from numpy.core import iinfo @@ -205,15 +203,7 @@ def eye(N, M=None, k=0, dtype=float, order='C', *, like=None): """ if like is not None: - return array_function_dispatch_like( - _eye_with_like, - N, - M=M, - k=k, - dtype=dtype, - order=order, - like=like - ) + return _eye_with_like(N, M=M, k=k, dtype=dtype, order=order, like=like) if M is None: M = N m = zeros((N, M), dtype=dtype, order=order) @@ -415,9 +405,7 @@ def tri(N, M=None, k=0, dtype=float, *, like=None): """ if like is not None: - return array_function_dispatch_like( - _tri_with_like, N, M=M, k=k, dtype=dtype, like=like - ) + return _tri_with_like(N, M=M, k=k, dtype=dtype, like=like) if M is None: M = N |