diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-03-05 21:43:22 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-03-27 18:42:34 -0600 |
| commit | 91aa03f4a1065319e85c6ee90306971c301fd58c (patch) | |
| tree | c4d40c32610eccebb71ad1f52c4f389c0d1b86b0 /numpy/core/arrayprint.py | |
| parent | 1a816c79f7212102634c28e0896547671d347a60 (diff) | |
| download | numpy-91aa03f4a1065319e85c6ee90306971c301fd58c.tar.gz | |
2to3: Replace xrange by range and use list(range(...)) where needed
In python3 range is an iterator and `xrange` has been removed. This has
two consequence for code:
1) Where a list is needed `list(range(...))` must be used.
2) `xrange` must be replaced by `range`
Both of these changes also work in python2 and this patch makes both.
There are three places fixed that do not need it, but I left them in
so that the result would be `xrange` clean.
Closes #3092
Diffstat (limited to 'numpy/core/arrayprint.py')
| -rw-r--r-- | numpy/core/arrayprint.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py index fa91a4799..c665cec0e 100644 --- a/numpy/core/arrayprint.py +++ b/numpy/core/arrayprint.py @@ -480,14 +480,14 @@ def _formatArray(a, format_function, rank, max_line_len, if rank == 1: s = "" line = next_line_prefix - for i in xrange(leading_items): + for i in range(leading_items): word = format_function(a[i]) + separator s, line = _extendLine(s, line, word, max_line_len, next_line_prefix) if summary_insert1: s, line = _extendLine(s, line, summary_insert1, max_line_len, next_line_prefix) - for i in xrange(trailing_items, 1, -1): + for i in range(trailing_items, 1, -1): word = format_function(a[-i]) + separator s, line = _extendLine(s, line, word, max_line_len, next_line_prefix) @@ -498,7 +498,7 @@ def _formatArray(a, format_function, rank, max_line_len, else: s = '[' sep = separator.rstrip() - for i in xrange(leading_items): + for i in range(leading_items): if i > 0: s += next_line_prefix s += _formatArray(a[i], format_function, rank-1, max_line_len, @@ -509,7 +509,7 @@ def _formatArray(a, format_function, rank, max_line_len, if summary_insert1: s += next_line_prefix + summary_insert1 + "\n" - for i in xrange(trailing_items, 1, -1): + 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, |