Convert six.moves.xrange() to range() for Python 3

cclauss · cclauss · commit dec88cfc4c81 · 2018-02-19T23:47:48.000+01:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -2,7 +2,7 @@
                         unicode_literals)
 
 import six
-from six.moves import xrange, zip, zip_longest
+from six.moves import zip, zip_longest
 
 import functools
 import itertools
@@ -3923,7 +3923,7 @@ def dopatch(xs, ys, **kwargs):
         else:
             def doplot(*args, **kwargs):
                 shuffled = []
-                for i in xrange(0, len(args), 2):
+                for i in range(0, len(args), 2):
                     shuffled.extend([args[i + 1], args[i]])
                 return self.plot(*shuffled, **kwargs)
 
@@ -3937,7 +3937,7 @@ def dopatch(xs, ys, **kwargs):
                              "values must have same the length")
         # check position
         if positions is None:
-            positions = list(xrange(1, N + 1))
+            positions = list(range(1, N + 1))
         elif len(positions) != N:
             raise ValueError(datashape_message.format("positions"))
 
@@ -4558,31 +4558,31 @@ def hexbin(self, x, y, C=None, gridsize=100, bins=None,
 
             # create accumulation arrays
             lattice1 = np.empty((nx1, ny1), dtype=object)
-            for i in xrange(nx1):
-                for j in xrange(ny1):
+            for i in range(nx1):
+                for j in range(ny1):
                     lattice1[i, j] = []
             lattice2 = np.empty((nx2, ny2), dtype=object)
-            for i in xrange(nx2):
-                for j in xrange(ny2):
+            for i in range(nx2):
+                for j in range(ny2):
                     lattice2[i, j] = []
 
-            for i in xrange(len(x)):
+            for i in range(len(x)):
                 if bdist[i]:
                     if 0 <= ix1[i] < nx1 and 0 <= iy1[i] < ny1:
                         lattice1[ix1[i], iy1[i]].append(C[i])
                 else:
                     if 0 <= ix2[i] < nx2 and 0 <= iy2[i] < ny2:
                         lattice2[ix2[i], iy2[i]].append(C[i])
 
-            for i in xrange(nx1):
-                for j in xrange(ny1):
+            for i in range(nx1):
+                for j in range(ny1):
                     vals = lattice1[i, j]
                     if len(vals) > mincnt:
                         lattice1[i, j] = reduce_C_function(vals)
                     else:
                         lattice1[i, j] = np.nan
-            for i in xrange(nx2):
-                for j in xrange(ny2):
+            for i in range(nx2):
+                for j in range(ny2):
                     vals = lattice2[i, j]
                     if len(vals) > mincnt:
                         lattice2[i, j] = reduce_C_function(vals)
@@ -6410,7 +6410,7 @@ def hist(self, x, bins=None, range=None, density=None, weights=None,
         """
         # Avoid shadowing the builtin.
         bin_range = range
-        del range
+        from builtins import range
 
         if not self._hold:
             self.cla()
@@ -6480,7 +6480,7 @@ def hist(self, x, bins=None, range=None, density=None, weights=None,
                     'weights should have the same shape as x')
 
         if color is None:
-            color = [self._get_lines.get_next_color() for i in xrange(nx)]
+            color = [self._get_lines.get_next_color() for i in range(nx)]
         else:
             color = mcolors.to_rgba_array(color)
             if len(color) != nx:
@@ -6507,7 +6507,7 @@ def hist(self, x, bins=None, range=None, density=None, weights=None,
         tops = []
         mlast = None
         # Loop through datasets
-        for i in xrange(nx):
+        for i in range(nx):
             # this will automatically overwrite bins,
             # so that each histogram uses the same bins
             m, bins = np.histogram(x[i], bins, weights=w[i], **hist_kwargs)
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -9,7 +9,7 @@
 from __future__ import absolute_import, division, print_function
 
 import six
-from six.moves import zip
+from six.moves import xrange, zip
 import bz2
 import collections
 import contextlib
@@ -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, range(len(seq))):
+    for (word, ind) in zip(seq, xrange(len(seq))):
         s_len += len(word) + 1  # +1 to account for the len(' ')
         if s_len >= N:
             return ind
@@ -1098,7 +1098,7 @@ def allequal(seq):
     if len(seq) < 2:
         return True
     val = seq[0]
-    for i in range(1, len(seq)):
+    for i in xrange(1, len(seq)):
         thisval = seq[i]
         if thisval != val:
             return False
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -22,7 +22,7 @@
                         unicode_literals)
 
 import six
-from six.moves import zip
+from six.moves import xrange, zip
 
 import warnings
 
@@ -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 range(N)]
+            xy = [list(zip(X[i], Y[i])) for i in xrange(N)]
         else:
-            xy = [list(zip(Y[i], X[i])) for i in range(N)]
+            xy = [list(zip(Y[i], X[i])) for i in xrange(N)]
         col = collections.LineCollection(xy, linewidths=linewidths)
 
         if erase and self.lines:
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -18,7 +18,7 @@
                         unicode_literals)
 
 import six
-from six import unichr
+from six import unichr, xrange
 
 import os
 from math import ceil
@@ -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 range(1, loc + 1):
+            for i in xrange(1, loc + 1):
                 prev_char = s[loc-i]
                 if prev_char != ' ':
                     break
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -138,6 +138,7 @@
                         unicode_literals)
 
 import six
+from six.moves import xrange
 
 import sys, os, shutil, io, re, textwrap
 from os.path import relpath
@@ -596,7 +597,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 range(1000):
+        for j in xrange(1000):
             if len(code_pieces) > 1:
                 img = ImageFile('%s_%02d_%02d' % (output_base, i, j),
                                 output_dir)
diff --git a/lib/mpl_toolkits/axes_grid1/colorbar.py b/lib/mpl_toolkits/axes_grid1/colorbar.py
@@ -22,7 +22,7 @@
                         unicode_literals)
 
 import six
-from six.moves import zip
+from six.moves import xrange, zip
 
 import numpy as np
 import matplotlib as mpl
@@ -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 range(1, N-1)]
+            return [list(zip(X[i], Y[i])) for i in xrange(1, N-1)]
         else:
-            return [list(zip(Y[i], X[i])) for i in range(1, N-1)]
+            return [list(zip(Y[i], X[i])) for i in xrange(1, N-1)]
 
     def _add_solids(self, X, Y, C):
         '''
