MAINT: Combine legacy sections of _formatArray #10143
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eric-wieser
commented
Dec 1, 2017
numpy/core/arrayprint.py
Outdated
| @@ -669,28 +669,29 @@ def _formatArray(a, format_function, rank, max_line_len, next_line_prefix, | |||
| else: | |||
| s = '[' | |||
| sep = separator.rstrip() | |||
| line_sep = '\n'*max(rank-1, 1) | |||
There was a problem hiding this comment.
No need, we already know that rank is not 0 or 1, and if it's any other value < 1 we have bigger problems.
eric-wieser
commented
Dec 1, 2017
|
|
||
| for i in range(trailing_items, 1, -1): | ||
| if leading_items or i != trailing_items: | ||
| 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() + line_sep |
There was a problem hiding this comment.
We already called rstrip above, so no point doing it again
8a22a98 to
753291c
Compare
|
Looks good, just needs a rebase. |
753291c to
4c28c8f
Compare
|
Rebased |
|
Tests now passing |
|
All right, merging. Nice cleanup! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pulls together the changes in #10120, #9815, and #10129 into a more readable fix.
Now it's pretty easy to see the ways in which the legacy behavior was strange.