From 737c3c48d0fd3efaa2f863788aa48ee119c13d3e Mon Sep 17 00:00:00 2001 From: Eric Wieser Date: Thu, 30 Nov 2017 08:57:49 -0800 Subject: BUG: edgeitems kwarg is ignored The global settings were being used instead --- numpy/core/arrayprint.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'numpy/core/arrayprint.py') diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py index 93a659616..7b2b37694 100644 --- a/numpy/core/arrayprint.py +++ b/numpy/core/arrayprint.py @@ -273,25 +273,24 @@ def get_printoptions(): return _format_options.copy() -def _leading_trailing(a, index=()): +def _leading_trailing(a, edgeitems, index=()): """ Keep only the N-D corners (leading and trailing edges) of an array. Should be passed a base-class ndarray, since it makes no guarantees about preserving subclasses. """ - edgeitems = _format_options['edgeitems'] axis = len(index) if axis == a.ndim: return a[index] if a.shape[axis] > 2*edgeitems: return concatenate(( - _leading_trailing(a, index + np.index_exp[ :edgeitems]), - _leading_trailing(a, index + np.index_exp[-edgeitems:]) + _leading_trailing(a, edgeitems, index + np.index_exp[ :edgeitems]), + _leading_trailing(a, edgeitems, index + np.index_exp[-edgeitems:]) ), axis=axis) else: - return _leading_trailing(a, index + np.index_exp[:]) + return _leading_trailing(a, edgeitems, index + np.index_exp[:]) def _object_format(o): @@ -437,7 +436,7 @@ def _array2string(a, options, separator=' ', prefix=""): if a.size > options['threshold']: summary_insert = "..." - data = _leading_trailing(data) + data = _leading_trailing(data, options['edgeitems']) else: summary_insert = "" -- cgit v1.2.1