Merge lp:~gz/brz/xrangeless into lp:brz

[Martin Packman]

Apply 2to3 xrange fixer

Mostly straightforward. All uses of xrange become range.

When one of these conditions is met:

* Performance implications unclear
* Module uses both list and iterator returns
* Will be needing dict sixish imports too

I also replaced the range name in the module with the iterator implementation.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/56/

=== modified file 'breezy/_annotator_py.py'
--- breezy/_annotator_py.py	2017-05-25 01:35:55 +0000
+++ breezy/_annotator_py.py	2017-06-04 18:29:46 +0000
@@ -31,6 +31,9 @@
     osutils,
     ui,
     )
+from .sixish import (
+    range,
+    )
 
 
 class Annotator(object):
@@ -183,7 +186,7 @@
             par_sub = parent_annotations[parent_idx:parent_idx + match_len]
             if ann_sub == par_sub:
                 continue
-            for idx in xrange(match_len):
+            for idx in range(match_len):
                 ann = ann_sub[idx]
                 par_ann = par_sub[idx]
                 ann_idx = lines_idx + idx

=== modified file 'breezy/_dirstate_helpers_py.py'
--- breezy/_dirstate_helpers_py.py	2017-05-25 01:35:55 +0000
+++ breezy/_dirstate_helpers_py.py	2017-06-04 18:29:46 +0000
@@ -26,6 +26,9 @@
 # All we really need is the IN_MEMORY_MODIFIED constant
 from breezy import errors
 from .dirstate import DirState
+from .sixish import (
+    range,
+    )
 
 
 def pack_stat(st, _b64=binascii.b2a_base64, _pack=struct.Struct('>6L').pack):
@@ -268,7 +271,7 @@
         if next is None:
             next = _iter.next
         # Move the iterator to the current position
-        for x in xrange(cur):
+        for x in range(cur):
             next()
         # The two blocks here are deliberate: the root block and the
         # contents-of-root block.
@@ -276,7 +279,7 @@
         current_block = state._dirblocks[0][1]
         current_dirname = ''
         append_entry = current_block.append
-        for count in xrange(state._num_entries):
+        for count in range(state._num_entries):
             dirname = next()
             name = next()
             file_id = next()
@@ -313,7 +316,7 @@
     else:
         fields_to_entry = state._get_fields_to_entry()
         entries = [fields_to_entry(fields[pos:pos+entry_size])
-                   for pos in xrange(cur, field_count, entry_size)]
+                   for pos in range(cur, field_count, entry_size)]
         state._entries_to_current_state(entries)
     # To convert from format 2  => format 3
     # state._dirblocks = sorted(state._dirblocks,

=== modified file 'breezy/_groupcompress_py.py'
--- breezy/_groupcompress_py.py	2017-05-22 00:56:52 +0000
+++ breezy/_groupcompress_py.py	2017-06-04 18:29:46 +0000
@@ -23,6 +23,9 @@
 from __future__ import absolute_import
 
 from . import osutils
+from .sixish import (
+    range,
+    )
 
 
 class _OutputHandler(object):
@@ -38,7 +41,7 @@
     def add_copy(self, start_byte, end_byte):
         # The data stream allows >64kB in a copy, but to match the compiled
         # code, we will also limit it to a 64kB copy
-        for start_byte in xrange(start_byte, end_byte, 64*1024):
+        for start_byte in range(start_byte, end_byte, 64*1024):
             num_bytes = min(64*1024, end_byte - start_byte)
             copy_bytes = encode_copy_instruction(start_byte, num_bytes)
             self.out_lines.append(copy_bytes)
@@ -64,7 +67,7 @@
         # Flush out anything pending
         self._flush_insert()
         line_len = len(line)
-        for start_index in xrange(0, line_len, 127):
+        for start_index in range(0, line_len, 127):
             next_len = min(127, line_len - start_index)
             self.out_lines.append(chr(next_len))
             self.index_lines.append(False)
@@ -256,7 +259,7 @@
         bytes_to_insert = ''.join(new_lines[start_linenum:end_linenum])
         insert_length = len(bytes_to_insert)
         # Each insert instruction is at most 127 bytes long
-        for start_byte in xrange(0, insert_length, 127):
+        for start_byte in range(0, insert_length, 127):
             insert_count = min(insert_length - start_byte, 127)
             out_lines.append(chr(insert_count))
             # Don't index the 'insert' instruction
@@ -276,7 +279,7 @@
         num_bytes = stop_byte - first_byte
         # The data stream allows >64kB in a copy, but to match the compiled
         # code, we will also limit it to a 64kB copy
-        for start_byte in xrange(first_byte, stop_byte, 64*1024):
+        for start_byte in range(first_byte, stop_byte, 64*1024):
             num_bytes = min(64*1024, stop_byte - start_byte)
             copy_bytes = encode_copy_instruction(start_byte, num_bytes)
             out_lines.append(copy_bytes)

=== modified file 'breezy/_patiencediff_py.py'
--- breezy/_patiencediff_py.py	2017-05-22 00:56:52 +0000
+++ breezy/_patiencediff_py.py	2017-06-04 18:29:46 +0000
@@ -43,8 +43,7 @@
     # set index[line in a] = position of line in a unless
     # a is a duplicate, in which case it's set to None
     index = {}
-    for i in xrange(len(a)):
-        line = a[i]
+    for i, line in enumerate(a):
         if line in index:
             index[line] = None
         else:
@@ -162,7 +161,7 @@
             nbhi -= 1
         recurse_matches_py(a, b, last_a_pos+1, last_b_pos+1,
                            nahi, nbhi, answer, maxrecursion - 1)
-        for i in xrange(ahi - nahi):
+        for i in range(ahi - nahi):
             answer.append((nahi + i, nbhi + i))
 
 

=== modified file 'breezy/annotate.py'
--- breezy/annotate.py	2017-05-25 01:35:55 +0000
+++ breezy/annotate.py	2017-06-04 18:29:46 +0000
@@ -350,7 +350,7 @@
         if child_idx > last_child_idx:
             output_extend(child_lines[start_child + last_child_idx
                                       :start_child + child_idx])
-        for offset in xrange(match_len):
+        for offset in range(match_len):
             left = child_lines[start_child+child_idx+offset]
             right = right_lines[start_right+right_idx+offset]
             if left[0] == right[0]:

=== modified file 'breezy/btree_index.py'
--- breezy/btree_index.py	2017-05-26 09:35:13 +0000
+++ breezy/btree_index.py	2017-06-04 18:29:46 +0000
@@ -43,6 +43,7 @@
 from .sixish import (
     BytesIO,
     map,
+    range,
     )
 
 
@@ -817,10 +818,10 @@
         if total_pages - len(cached_offsets) <= self._recommended_pages:
             # Read whatever is left
             if cached_offsets:
-                expanded = [x for x in xrange(total_pages)
+                expanded = [x for x in range(total_pages)
                                if x not in cached_offsets]
             else:
-                expanded = range(total_pages)
+                expanded = list(range(total_pages))
             if 'index' in debug.debug_flags:
                 trace.mutter('  reading all unread pages: %s', expanded)
             return expanded
@@ -1017,7 +1018,7 @@
             return
         start_of_leaves = self._row_offsets[-2]
         end_of_leaves = self._row_offsets[-1]
-        needed_offsets = range(start_of_leaves, end_of_leaves)
+        needed_offsets = list(range(start_of_leaves, end_of_leaves))
         if needed_offsets == [0]:
             # Special case when we only have a root node, as we have already
             # read everything
@@ -1543,7 +1544,7 @@
                     self._size = num_bytes - base_offset
                     # the whole thing should be parsed out of 'bytes'
                     ranges = [(start, min(_PAGE_SIZE, num_bytes - start))
-                        for start in xrange(base_offset, num_bytes, _PAGE_SIZE)]
+                        for start in range(base_offset, num_bytes, _PAGE_SIZE)]
                     break
             else:
                 if offset > self._size:
@@ -1596,7 +1597,7 @@
             # We shouldn't be reading anything anyway
             start_node = 1
         node_end = self._row_offsets[-1]
-        for node in self._read_nodes(range(start_node, node_end)):
+        for node in self._read_nodes(list(range(start_node, node_end))):
             pass
 
 

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-06-02 20:41:53 +0000
+++ breezy/builtins.py	2017-06-04 18:29:46 +0000
@@ -520,8 +520,8 @@
         # This is because the first page of every row starts with an
         # uncompressed header.
         bt, bytes = self._get_index_and_bytes(trans, basename)
-        for page_idx, page_start in enumerate(xrange(0, len(bytes),
-                                                     btree_index._PAGE_SIZE)):
+        for page_idx, page_start in enumerate(range(0, len(bytes),
+                                                    btree_index._PAGE_SIZE)):
             page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
             page_bytes = bytes[page_start:page_end]
             if page_idx == 0:

=== modified file 'breezy/chk_map.py'
--- breezy/chk_map.py	2017-05-22 00:56:52 +0000
+++ breezy/chk_map.py	2017-06-04 18:29:46 +0000
@@ -1570,7 +1570,7 @@
         # handled the interesting ones
         for prefix, ref in old_chks_to_enqueue:
             not_interesting = True
-            for i in xrange(len(prefix), 0, -1):
+            for i in range(len(prefix), 0, -1):
                 if prefix[:i] in new_prefixes:
                     not_interesting = False
                     break
@@ -1630,7 +1630,7 @@
         # 'ab', then we also need to include 'a'.) So expand the
         # new_prefixes to include all shorter prefixes
         for prefix in list(new_prefixes):
-            new_prefixes.update([prefix[:i] for i in xrange(1, len(prefix))])
+            new_prefixes.update([prefix[:i] for i in range(1, len(prefix))])
         self._enqueue_old(new_prefixes, old_chks_to_enqueue)
 
     def _flush_new_queue(self):

=== modified file 'breezy/dirstate.py'
--- breezy/dirstate.py	2017-05-25 01:35:55 +0000
+++ breezy/dirstate.py	2017-06-04 18:29:46 +0000
@@ -242,6 +242,9 @@
     trace,
     urlutils,
     )
+from .sixish import (
+    range,
+    )
 
 
 # This is the Windows equivalent of ENOTDIR
@@ -734,7 +737,7 @@
                     # careful if we should append rather than overwrite
                     if last_entry_num != first_entry_num:
                         paths.setdefault(last_path, []).append(last_fields)
-                    for num in xrange(first_entry_num+1, last_entry_num):
+                    for num in range(first_entry_num+1, last_entry_num):
                         # TODO: jam 20070223 We are already splitting here, so
                         #       shouldn't we just split the whole thing rather
                         #       than doing the split again in add_one_record?
@@ -920,7 +923,7 @@
                     # careful if we should append rather than overwrite
                     if last_entry_num != first_entry_num:
                         paths.setdefault(last_dir, []).append(last_fields)
-                    for num in xrange(first_entry_num+1, last_entry_num):
+                    for num in range(first_entry_num+1, last_entry_num):
                         # TODO: jam 20070223 We are already splitting here, so
                         #       shouldn't we just split the whole thing rather
                         #       than doing the split again in add_one_record?
@@ -2045,7 +2048,7 @@
                           _int(fields[cur+2]),        # size
                           fields[cur+3] == 'y',       # executable
                           fields[cur+4],              # stat or revision_id
-                         ) for cur in xrange(3, len(fields)-1, 5)]
+                         ) for cur in range(3, len(fields)-1, 5)]
                 return path_name_file_id_key, trees
             return fields_to_entry_n_parents
 
@@ -2695,7 +2698,7 @@
                     # mapping from path,id. We need to look up the correct path
                     # for the indexes from 0 to tree_index -1
                     new_details = []
-                    for lookup_index in xrange(tree_index):
+                    for lookup_index in range(tree_index):
                         # boundary case: this is the first occurence of file_id
                         # so there are no id_indexes, possibly take this out of
                         # the loop?
@@ -3058,7 +3061,7 @@
                     # TODO: This re-evaluates the existing_keys set, do we need
                     #       to do that ourselves?
                     other_key = list(existing_keys)[0]
-                for lookup_index in xrange(1, num_present_parents + 1):
+                for lookup_index in range(1, num_present_parents + 1):
                     # grab any one entry, use it to find the right path.
                     # TODO: optimise this to reduce memory use in highly
                     # fragmented situations by reusing the relocation
@@ -3229,7 +3232,7 @@
         # We check this with a dict per tree pointing either to the present
         # name, or None if absent.
         tree_count = self._num_present_parents() + 1
-        id_path_maps = [dict() for i in range(tree_count)]
+        id_path_maps = [{} for _ in range(tree_count)]
         # Make sure that all renamed entries point to the correct location.
         for entry in self._iter_entries():
             file_id = entry[0][2]

=== modified file 'breezy/groupcompress.py'
--- breezy/groupcompress.py	2017-05-26 09:35:13 +0000
+++ breezy/groupcompress.py	2017-06-04 18:29:46 +0000
@@ -44,6 +44,7 @@
 from .lru_cache import LRUSizeCache
 from .sixish import (
     map,
+    range,
     )
 from .versionedfile import (
     _KeyRefs,
@@ -767,7 +768,7 @@
         block = GroupCompressBlock.from_bytes(block_bytes)
         del block_bytes
         result = cls(block)
-        for start in xrange(0, len(header_lines), 4):
+        for start in range(0, len(header_lines), 4):
             # intern()?
             key = tuple(header_lines[start].split('\x00'))
             parents_line = header_lines[start+1]

=== modified file 'breezy/knit.py'
--- breezy/knit.py	2017-05-25 01:35:55 +0000
+++ breezy/knit.py	2017-06-04 18:29:46 +0000
@@ -98,6 +98,7 @@
     )
 from .sixish import (
     BytesIO,
+    range,
     )
 from .versionedfile import (
     _KeyRefs,
@@ -655,7 +656,7 @@
         for header in lines:
             header = header.split(',')
             count = int(header[2])
-            for i in xrange(count):
+            for _ in range(count):
                 origin, text = next(lines).split(' ', 1)
                 yield text
 
@@ -740,7 +741,7 @@
         for header in lines:
             header = header.split(',')
             count = int(header[2])
-            for i in xrange(count):
+            for _ in range(count):
                 yield next(lines)
 
     def lower_fulltext(self, content):
@@ -1117,7 +1118,7 @@
         """
         delta_size = 0
         fulltext_size = None
-        for count in xrange(self._max_delta_chain):
+        for count in range(self._max_delta_chain):
             try:
                 # Note that this only looks in the index of this particular
                 # KnitVersionedFiles, not in the fallbacks.  This ensures that

=== modified file 'breezy/log.py'
--- breezy/log.py	2017-05-26 09:35:13 +0000
+++ breezy/log.py	2017-06-04 18:29:46 +0000
@@ -87,6 +87,7 @@
     )
 from breezy.sixish import (
     BytesIO,
+    range,
     zip,
     )
 
@@ -1212,7 +1213,7 @@
     #       rate). This particular access is clustered with a low success rate.
     modified_text_revisions = set()
     chunk_size = 1000
-    for start in xrange(0, len(text_keys), chunk_size):
+    for start in range(0, len(text_keys), chunk_size):
         next_keys = text_keys[start:start + chunk_size]
         # Only keep the revision_id portion of the key
         modified_text_revisions.update(
@@ -1233,7 +1234,7 @@
 
         if rev_id in modified_text_revisions:
             # This needs to be logged, along with the extra revisions
-            for idx in xrange(len(current_merge_stack)):
+            for idx in range(len(current_merge_stack)):
                 node = current_merge_stack[idx]
                 if node is not None:
                     if include_merges or node[2] == 0:
@@ -1866,8 +1867,7 @@
     # This is the first index which is different between
     # old and new
     base_idx = None
-    for i in xrange(max(len(new_rh),
-                        len(old_rh))):
+    for i in range(max(len(new_rh), len(old_rh))):
         if (len(new_rh) <= i
             or len(old_rh) <= i
             or new_rh[i] != old_rh[i]):

=== modified file 'breezy/merge3.py'
--- breezy/merge3.py	2017-05-22 00:56:52 +0000
+++ breezy/merge3.py	2017-06-04 18:29:46 +0000
@@ -53,7 +53,7 @@
     """
     if (aend-astart) != (bend-bstart):
         return False
-    for ia, ib in zip(xrange(astart, aend), xrange(bstart, bend)):
+    for ia, ib in zip(range(astart, aend), range(bstart, bend)):
         if a[ia] != b[ib]:
             return False
     else:

=== modified file 'breezy/multiparent.py'
--- breezy/multiparent.py	2017-05-25 01:35:55 +0000
+++ breezy/multiparent.py	2017-06-04 18:29:46 +0000
@@ -34,6 +34,7 @@
 """)
 from .sixish import (
     BytesIO,
+    range,
     )
 
 
@@ -169,7 +170,7 @@
         mpvf = MultiMemoryVersionedFile()
         for num, parent in enumerate(parents):
             mpvf.add_version(BytesIO(parent).readlines(), num, [])
-        mpvf.add_diff(self, 'a', range(len(parents)))
+        mpvf.add_diff(self, 'a', list(range(len(parents))))
         return mpvf.get_line_list(['a'])[0]
 
     @classmethod
@@ -208,7 +209,7 @@
                 break
             if cur_line[0] == 'i':
                 num_lines = int(cur_line.split(' ')[1])
-                hunk_lines = [next(line_iter) for x in xrange(num_lines)]
+                hunk_lines = [next(line_iter) for _ in range(num_lines)]
                 hunk_lines[-1] = hunk_lines[-1][:-1]
                 hunks.append(NewText(hunk_lines))
             elif cur_line[0] == '\n':
@@ -338,7 +339,7 @@
             return False
         if len(parent_ids) == 0:
             return True
-        for ignored in xrange(self.snapshot_interval):
+        for ignored in range(self.snapshot_interval):
             if len(parent_ids) == 0:
                 return False
             version_ids = parent_ids

=== modified file 'breezy/plugins/fastimport/processors/info_processor.py'
--- breezy/plugins/fastimport/processors/info_processor.py	2017-05-23 23:21:16 +0000
+++ breezy/plugins/fastimport/processors/info_processor.py	2017-06-04 18:29:46 +0000
@@ -87,7 +87,7 @@
         # Commit stats
         if self.cmd_counts['commit']:
             p_items = []
-            for i in xrange(0, self.max_parent_count + 1):
+            for _ in range(self.max_parent_count + 1):
                 if i in self.parent_counts:
                     count = self.parent_counts[i]
                     p_items.append(("parents-%d" % i, count))

=== modified file 'breezy/sixish.py'
--- breezy/sixish.py	2017-05-24 23:30:47 +0000
+++ breezy/sixish.py	2017-06-04 18:29:46 +0000
@@ -39,8 +39,9 @@
     import io as _io
     BytesIO = _io.BytesIO
     StringIO = _io.StringIO
-    from builtins import zip, map
+    from builtins import range, map, zip
 else:
     from cStringIO import StringIO as BytesIO
     from StringIO import StringIO
     from future_builtins import zip, map
+    range = xrange

=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2017-05-30 22:59:36 +0000
+++ breezy/tests/__init__.py	2017-06-04 18:29:46 +0000
@@ -4418,7 +4418,7 @@
     Return None if all non-ascii characters is valid
     for given encoding.
     """
-    for i in xrange(128, 256):
+    for i in range(128, 256):
         char = chr(i)
         try:
             char.decode(encoding)

=== modified file 'breezy/tests/per_pack_repository.py'
--- breezy/tests/per_pack_repository.py	2017-05-25 01:35:55 +0000
+++ breezy/tests/per_pack_repository.py	2017-06-04 18:29:46 +0000
@@ -553,7 +553,7 @@
         tree = self.make_branch_and_tree('tree')
         tree.lock_write()
         try:
-            for i in xrange(9):
+            for i in range(9):
                 tree.commit('rev %d' % (i,))
             r2 = repository.Repository.open('tree')
             r2.lock_write()

=== modified file 'breezy/tests/test_btree_index.py'
--- breezy/tests/test_btree_index.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_btree_index.py	2017-06-04 18:29:46 +0000
@@ -70,7 +70,7 @@
                 prefix = (str(prefix_pos) * 40,)
             else:
                 prefix = ()
-            for pos in xrange(count):
+            for pos in range(count):
                 # TODO: This creates odd keys. When count == 100,000, it
                 #       creates a 240 byte key
                 key = prefix + (str(pos) * 40,)
@@ -751,7 +751,7 @@
         index = btree_index.BTreeGraphIndex(trans, 'index', None)
         del trans._activity[:]
         nodes = dict(index._read_nodes([0]))
-        self.assertEqual(range(num_pages), nodes.keys())
+        self.assertEqual(list(range(num_pages)), sorted(nodes))
 
     def test_2_levels_key_count_2_2(self):
         builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
@@ -845,7 +845,7 @@
     def test_key_too_big(self):
         # the size that matters here is the _compressed_ size of the key, so we can't
         # do a simple character repeat.
-        bigKey = ''.join(map(repr, xrange(btree_index._PAGE_SIZE)))
+        bigKey = ''.join(map(repr, range(btree_index._PAGE_SIZE)))
         self.assertRaises(errors.BadIndexKey,
                           self.make_index,
                           nodes=[((bigKey,), 'value', ())])
@@ -1111,7 +1111,7 @@
         nodes = []
         ref_lists = ((),)
         rev_keys = []
-        for i in xrange(400):
+        for i in range(400):
             rev_id = '%s-%s-%s' % (email,
                                    osutils.compact_date(start_time + i),
                                    osutils.rand_chars(16))
@@ -1456,7 +1456,7 @@
 
     def test_read_all_from_root(self):
         index = self.make_index(4096*10, 20)
-        self.assertExpandOffsets(range(10), index, [0])
+        self.assertExpandOffsets(list(range(10)), index, [0])
 
     def test_read_all_when_cached(self):
         # We've read enough that we can grab all the rest in a single request

=== modified file 'breezy/tests/test_chunk_writer.py'
--- breezy/tests/test_chunk_writer.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_chunk_writer.py	2017-06-04 18:29:46 +0000
@@ -72,7 +72,7 @@
         lines = []
         for group in range(48):
             offset = group * 50
-            numbers = range(offset, offset + 50)
+            numbers = list(range(offset, offset + 50))
             # Create a line with this group
             lines.append(''.join(map(str, numbers)) + '\n')
         writer = chunk_writer.ChunkWriter(4096)
@@ -93,7 +93,7 @@
         lines = []
         for group in range(48):
             offset = group * 50
-            numbers = range(offset, offset + 50)
+            numbers = list(range(offset, offset + 50))
             # Create a line with this group
             lines.append(''.join(map(str, numbers)) + '\n')
         writer = chunk_writer.ChunkWriter(4096, 256)

=== modified file 'breezy/tests/test_estimate_compressed_size.py'
--- breezy/tests/test_estimate_compressed_size.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_estimate_compressed_size.py	2017-06-04 18:29:46 +0000
@@ -47,7 +47,7 @@
         ze = estimate_compressed_size.ZLibEstimator(32000)
         raw_data = self.get_slightly_random_content(60000)
         block_size = 1000
-        for start in xrange(0, len(raw_data), block_size):
+        for start in range(0, len(raw_data), block_size):
             ze.add_content(raw_data[start:start+block_size])
             if ze.full():
                 break
@@ -65,7 +65,7 @@
         ze = estimate_compressed_size.ZLibEstimator(64000)
         raw_data = self.get_slightly_random_content(150000)
         block_size = 1000
-        for start in xrange(0, len(raw_data), block_size):
+        for start in range(0, len(raw_data), block_size):
             ze.add_content(raw_data[start:start+block_size])
             if ze.full():
                 break

=== modified file 'breezy/tests/test_fetch.py'
--- breezy/tests/test_fetch.py	2017-05-25 01:35:55 +0000
+++ breezy/tests/test_fetch.py	2017-06-04 18:29:46 +0000
@@ -401,7 +401,7 @@
         # well and the deltas get bigger.
         to_add = [
             ('add', ('', 'TREE_ROOT', 'directory', None))]
-        for i in xrange(10):
+        for i in range(10):
             fname = 'file%03d' % (i,)
             fileid = '%s-%s' % (fname, osutils.rand_chars(64))
             to_add.append(('add', (fname, fileid, 'file', 'content\n')))

=== modified file 'breezy/tests/test_globbing.py'
--- breezy/tests/test_globbing.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_globbing.py	2017-06-04 18:29:46 +0000
@@ -304,7 +304,7 @@
         This test assumes the globs are broken into regexs containing 99
         groups.
         """
-        patterns = [ u'*.%03d' % i for i in xrange(0,300) ]
+        patterns = [u'*.%03d' % i for i in range(300)]
         globster = Globster(patterns)
         # test the fence posts
         for x in (0,98,99,197,198,296,297,299):

=== modified file 'breezy/tests/test_groupcompress.py'
--- breezy/tests/test_groupcompress.py	2017-05-25 01:35:55 +0000
+++ breezy/tests/test_groupcompress.py	2017-06-04 18:29:46 +0000
@@ -406,7 +406,7 @@
         # partial decompression to work with. Most auto-generated data
         # compresses a bit too well, we want a combination, so we combine a sha
         # hash with compressible data.
-        for i in xrange(2048):
+        for i in range(2048):
             next_content = '%d\nThis is a bit of duplicate text\n' % (i,)
             content_chunks.append(next_content)
             next_sha1 = osutils.sha_string(next_content)
@@ -451,7 +451,7 @@
         # partial decompression to work with. Most auto-generated data
         # compresses a bit too well, we want a combination, so we combine a sha
         # hash with compressible data.
-        for i in xrange(2048):
+        for i in range(2048):
             next_content = '%d\nThis is a bit of duplicate text\n' % (i,)
             content_chunks.append(next_content)
             next_sha1 = osutils.sha_string(next_content)

=== modified file 'breezy/tests/test_hashcache.py'
--- breezy/tests/test_hashcache.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_hashcache.py	2017-06-04 18:29:46 +0000
@@ -96,7 +96,7 @@
 
     def test_hammer_hashcache(self):
         hc = self.make_hashcache()
-        for i in xrange(10000):
+        for i in range(10000):
             self.log('start writing at %s', time.time())
             f = file('foo', 'w')
             try:

=== modified file 'breezy/tests/test_index.py'
--- breezy/tests/test_index.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_index.py	2017-06-04 18:29:46 +0000
@@ -236,7 +236,7 @@
     def test_node_references_three_digits(self):
         # test the node digit expands as needed.
         builder = index.GraphIndexBuilder(reference_lists=1)
-        references = [(str(val), ) for val in reversed(range(9))]
+        references = [(str(val), ) for val in range(8, -1, -1)]
         builder.add_node(('2-key', ), '', (references, ))
         stream = builder.finish()
         contents = stream.read()

=== modified file 'breezy/tests/test_timestamp.py'
--- breezy/tests/test_timestamp.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/test_timestamp.py	2017-06-04 18:29:46 +0000
@@ -123,7 +123,7 @@
         self.assertEqual(o, o2)
         t -= 24*3600*365*2 # Start 2 years ago
         o = -12*3600
-        for count in xrange(500):
+        for count in range(500):
             t += random.random()*24*3600*30
             o = ((o/3600 + 13) % 25 - 12)*3600 # Add 1 wrap around from [-12, 12]
             date = timestamp.format_highres_date(t, o)

=== modified file 'breezy/tests/test_transport.py'
--- breezy/tests/test_transport.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_transport.py	2017-06-04 18:29:46 +0000
@@ -822,7 +822,7 @@
         # clone to root should stop at least at \\HOST part
         # not on \\
         t = local.EmulatedWin32LocalTransport('file://HOST/path/to/some/dir/')
-        for i in xrange(4):
+        for i in range(4):
             t = t.clone('..')
         self.assertEqual(t.base, 'file://HOST/')
         # make sure we reach the root

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2017-05-30 19:32:13 +0000
+++ breezy/tree.py	2017-06-04 18:29:46 +0000
@@ -1512,7 +1512,7 @@
                          for other in self._other_trees]
         other_entries = [self._step_one(walker) for walker in other_walkers]
         # Track extra nodes in the other trees
-        others_extra = [{} for i in xrange(len(self._other_trees))]
+        others_extra = [{} for _ in range(len(self._other_trees))]
 
         master_has_more = True
         step_one = self._step_one
@@ -1600,7 +1600,7 @@
                 # the lookup_by_file_id will be removing anything processed
                 # from the extras cache
                 other_extra.pop(file_id)
-                other_values = [(None, None) for i in xrange(idx)]
+                other_values = [(None, None)] * idx
                 other_values.append((other_path, other_ie))
                 for alt_idx, alt_extra in enumerate(self._others_extra[idx+1:]):
                     alt_idx = alt_idx + idx + 1

=== modified file 'breezy/urlutils.py'
--- breezy/urlutils.py	2017-05-22 00:56:52 +0000
+++ breezy/urlutils.py	2017-06-04 18:29:46 +0000
@@ -402,7 +402,7 @@
     # We have a unicode (hybrid) url
     path_chars = list(path)
 
-    for i in xrange(len(path_chars)):
+    for i in range(len(path_chars)):
         if path_chars[i] not in _url_safe_characters:
             chars = path_chars[i].encode('utf-8')
             path_chars[i] = ''.join(
@@ -723,9 +723,9 @@
 
     # Split into sections to try to decode utf-8
     res = url.split('/')
-    for i in xrange(1, len(res)):
+    for i in range(1, len(res)):
         escaped_chunks = res[i].split('%')
-        for j in xrange(1, len(escaped_chunks)):
+        for j in range(1, len(escaped_chunks)):
             item = escaped_chunks[j]
             try:
                 escaped_chunks[j] = _hex_display_map[item[:2]] + item[2:]

=== modified file 'breezy/vf_repository.py'
--- breezy/vf_repository.py	2017-05-30 19:32:13 +0000
+++ breezy/vf_repository.py	2017-06-04 18:29:46 +0000
@@ -73,6 +73,10 @@
     RepositoryFormat,
     )
 
+from .sixish import (
+    range,
+    )
+
 from .trace import (
     mutter
     )
@@ -1619,7 +1623,7 @@
         batch_count = len(revision_order) / batch_size + 1
         processed_texts = 0
         pb.update(gettext("Calculating text parents"), processed_texts, text_count)
-        for offset in xrange(batch_count):
+        for offset in range(batch_count):
             to_query = revision_order[offset * batch_size:(offset + 1) *
                 batch_size]
             if not to_query:

=== modified file 'breezy/weave.py'
--- breezy/weave.py	2017-05-30 19:32:13 +0000
+++ breezy/weave.py	2017-06-04 18:29:46 +0000
@@ -426,7 +426,6 @@
             return self._check_repeated_add(version_id, parents, lines, sha1)
 
         self._check_versions(parents)
-        ## self._check_lines(lines)
         new_version = len(self._parents)
 
         # if we abort after here the (in-memory) weave will be corrupt because only
@@ -521,13 +520,11 @@
         if not len(versions):
             return []
         i = set(versions)
-        for v in xrange(max(versions), 0, -1):
+        for v in range(max(versions), 0, -1):
             if v in i:
                 # include all its parents
                 i.update(self._parents[v])
         return i
-        ## except IndexError:
-        ##     raise ValueError("version %d not present in weave" % v)
 
     def get_ancestry(self, version_ids, topo_sorted=True):
         """See VersionedFile.get_ancestry."""
@@ -989,9 +986,6 @@
     :param msg: An optional message for the progress
     """
     wr = Weave()
-    ia = ib = 0
-    queue_a = range(wa.num_versions())
-    queue_b = range(wb.num_versions())
     # first determine combined parents of all versions
     # map from version name -> all parent names
     combined_parents = _reweave_parent_graphs(wa, wb)