Convert six.moves.xrange() to range() for Python 3 #10525
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
8b9f2e7 to
f73b62c
Compare
jklymak
approved these changes
Feb 19, 2018
|
See #10526 for the solution to the problem with |
anntzer
reviewed
Feb 19, 2018
lib/matplotlib/cbook/__init__.py
Outdated
| @@ -941,7 +941,7 @@ def get_split_ind(seq, N): | |||
|
|
|||
| s_len = 0 | |||
| # todo: use Alex's xrange pattern from the cbook for efficiency | |||
| for (word, ind) in zip(seq, xrange(len(seq))): | |||
| for (word, ind) in zip(seq, range(len(seq))): | |||
There was a problem hiding this comment.
these functions should just be deleted as they have been deprecated since 2.1
anntzer
reviewed
Feb 19, 2018
lib/matplotlib/cbook/__init__.py
Outdated
| @@ -1098,7 +1098,7 @@ def allequal(seq): | |||
| if len(seq) < 2: | |||
| return True | |||
| val = seq[0] | |||
| for i in xrange(1, len(seq)): | |||
| for i in range(1, len(seq)): | |||
anntzer
reviewed
Feb 19, 2018
lib/matplotlib/colorbar.py
Outdated
| @@ -561,9 +561,9 @@ def add_lines(self, levels, colors, linewidths, erase=True): | |||
| x = np.array([0.0, 1.0]) | |||
| X, Y = np.meshgrid(x, y) | |||
| if self.orientation == 'vertical': | |||
| xy = [list(zip(X[i], Y[i])) for i in xrange(N)] | |||
| xy = [list(zip(X[i], Y[i])) for i in range(N)] | |||
There was a problem hiding this comment.
probably better written using np.stack or a variant of it
anntzer
reviewed
Feb 19, 2018
lib/matplotlib/mathtext.py
Outdated
| @@ -2641,7 +2641,7 @@ def symbol(self, s, loc, toks): | |||
| if c in self._spaced_symbols: | |||
| # iterate until we find previous character, needed for cases | |||
| # such as ${ -2}$, $ -2$, or $ -2$. | |||
| for i in six.moves.xrange(1, loc + 1): | |||
| for i in range(1, loc + 1): | |||
There was a problem hiding this comment.
already refactored in the py3mathtext PR
anntzer
reviewed
Feb 19, 2018
| @@ -597,7 +596,7 @@ def render_figures(code, code_path, output_dir, output_base, context, | |||
| all_exists = True | |||
| for i, code_piece in enumerate(code_pieces): | |||
| images = [] | |||
| for j in xrange(1000): | |||
| for j in range(1000): | |||
There was a problem hiding this comment.
probably should be itertools.count()...
anntzer
reviewed
Feb 19, 2018
| @@ -529,9 +529,9 @@ def _edges(self, X, Y): | |||
| # Using the non-array form of these line segments is much | |||
| # simpler than making them into arrays. | |||
| if self.orientation == 'vertical': | |||
| return [list(zip(X[i], Y[i])) for i in xrange(1, N-1)] | |||
| return [list(zip(X[i], Y[i])) for i in range(1, N-1)] | |||
dec88cf to
8cf8798
Compare
8cf8798 to
b64e2d1
Compare
efiring
approved these changes
Feb 19, 2018
dstansby
approved these changes
Feb 21, 2018
This was referenced Feb 21, 2018
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.
PR Summary
As part of dropping support for Python 2, we can simplify the code by: