diff options
| author | Marten van Kerkwijk <mhvk@astro.utoronto.ca> | 2017-11-30 09:47:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-30 09:47:50 -0500 |
| commit | 3d43b3278bc62cbc6ec88e4e61f48ad7bd445b02 (patch) | |
| tree | 775065e7a74ea9e574a2de6e8b15cbe94e122692 /numpy/core/arrayprint.py | |
| parent | 2c310911fa0e8fea0e4f237736fd28de97ebb4d0 (diff) | |
| parent | 6df0b6e2b79aad40715f933b561660f951693289 (diff) | |
| download | numpy-3d43b3278bc62cbc6ec88e4e61f48ad7bd445b02.tar.gz | |
Merge pull request #10129 from eric-wieser/remove-trailing-space
ENH: Strip trailing spaces from continuation in multiline arrayprint
Diffstat (limited to 'numpy/core/arrayprint.py')
| -rw-r--r-- | numpy/core/arrayprint.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py index e4a048a42..3fad5d17d 100644 --- a/numpy/core/arrayprint.py +++ b/numpy/core/arrayprint.py @@ -664,16 +664,20 @@ def _formatArray(a, format_function, rank, max_line_len, next_line_prefix, else: s = '[' sep = separator.rstrip() + line_sep = '\n'*max(rank-1, 1) for i in range(leading_items): if i > 0: s += next_line_prefix s += _formatArray(a[i], format_function, rank-1, max_line_len, " " + next_line_prefix, separator, edge_items, summary_insert, legacy) - s = s.rstrip() + sep.rstrip() + '\n'*max(rank-1, 1) + s = s.rstrip() + sep.rstrip() + line_sep if summary_insert1: - s += next_line_prefix + summary_insert1 + "\n" + if legacy == '1.13': + s += next_line_prefix + summary_insert1 + "\n" + else: + s += next_line_prefix + summary_insert1.strip() + line_sep for i in range(trailing_items, 1, -1): if leading_items or i != trailing_items: @@ -681,7 +685,7 @@ def _formatArray(a, format_function, rank, max_line_len, next_line_prefix, s += _formatArray(a[-i], format_function, rank-1, max_line_len, " " + next_line_prefix, separator, edge_items, summary_insert, legacy) - s = s.rstrip() + sep.rstrip() + '\n'*max(rank-1, 1) + s = s.rstrip() + sep.rstrip() + line_sep if leading_items or trailing_items > 1: s += next_line_prefix s += _formatArray(a[-1], format_function, rank-1, max_line_len, |