From: Julien Goodwin Date: Thu, 30 Aug 2018 08:38:48 +0000 (+1000) Subject: Migrate all xrange calls to range in bup.compat X-Git-Tag: 0.30~59 X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=commitdiff_plain;h=d4100c81448484b8ea222fb78757bf003e181cf1 Migrate all xrange calls to range in bup.compat Signed-off-by: Julien Goodwin [rlb@defaultvalue.org: adjust commit message summary] Reviewed-by: Rob Browning Tested-by: Rob Browning --- diff --git a/cmd/damage-cmd.py b/cmd/damage-cmd.py index fa54bc9..ca2e98c 100755 --- a/cmd/damage-cmd.py +++ b/cmd/damage-cmd.py @@ -9,12 +9,13 @@ from __future__ import absolute_import import sys, os, random from bup import options +from bup.compat import range from bup.helpers import log def randblock(n): l = [] - for i in xrange(n): + for i in range(n): l.append(chr(random.randrange(0,256))) return ''.join(l) diff --git a/cmd/memtest-cmd.py b/cmd/memtest-cmd.py index 88ee06d..2fe71f5 100755 --- a/cmd/memtest-cmd.py +++ b/cmd/memtest-cmd.py @@ -9,6 +9,7 @@ from __future__ import absolute_import, print_function import sys, re, struct, time, resource from bup import git, bloom, midx, options, _helpers +from bup.compat import range from bup.helpers import handle_ctrl_c @@ -97,9 +98,9 @@ if opt.existing: for e in mi: yield e objit = iter(foreverit(m)) - -for c in xrange(opt.cycles): - for n in xrange(opt.number): + +for c in range(opt.cycles): + for n in range(opt.number): if opt.existing: bin = next(objit) assert(m.exists(bin)) diff --git a/cmd/midx-cmd.py b/cmd/midx-cmd.py index 1b81174..c7062db 100755 --- a/cmd/midx-cmd.py +++ b/cmd/midx-cmd.py @@ -9,6 +9,7 @@ from __future__ import absolute_import import glob, math, os, resource, struct, sys, tempfile from bup import options, git, midx, _helpers, xstat +from bup.compat import range from bup.helpers import (Sha1, add_error, atomically_replaced_file, debug1, fdatasync, handle_ctrl_c, log, mmap_readwrite, qprogress, saved_errors, unlink) @@ -33,10 +34,10 @@ merge_into = _helpers.merge_into def _group(l, count): - for i in xrange(0, len(l), count): + for i in range(0, len(l), count): yield l[i:i+count] - - + + def max_files(): mf = min(resource.getrlimit(resource.RLIMIT_NOFILE)) if mf > 32: diff --git a/lib/bup/client.py b/lib/bup/client.py index 8c364d1..cad6e28 100644 --- a/lib/bup/client.py +++ b/lib/bup/client.py @@ -3,6 +3,7 @@ from __future__ import absolute_import import errno, os, re, struct, sys, time, zlib from bup import git, ssh +from bup.compat import range from bup.helpers import (Conn, atomically_replaced_file, chunkyreader, debug1, debug2, linereader, lines_until_sentinel, mkdirp, progress, qprogress) @@ -27,7 +28,7 @@ def _raw_write_bwlimit(f, buf, bwcount, bwtime): # the average back up to bwlimit - that will risk overflowing the # outbound queue, which defeats the purpose. So if we fall behind # by more than one block delay, we shouldn't ever try to catch up. - for i in xrange(0,len(buf),4096): + for i in range(0,len(buf),4096): now = time.time() next = max(now, bwtime + 1.0*bwcount/bwlimit) time.sleep(next-now) @@ -414,7 +415,7 @@ class Client: conn.write('\n') conn.write('\n') if not format: - for _ in xrange(len(refs)): + for _ in range(len(refs)): line = conn.readline() if not line: raise ClientError('unexpected EOF') @@ -422,7 +423,7 @@ class Client: assert len(line) == 40 yield line else: - for _ in xrange(len(refs)): + for _ in range(len(refs)): line = conn.readline() if not line: raise ClientError('unexpected EOF') diff --git a/lib/bup/gc.py b/lib/bup/gc.py index 29d5ad8..6f64584 100644 --- a/lib/bup/gc.py +++ b/lib/bup/gc.py @@ -2,6 +2,7 @@ from __future__ import absolute_import import glob, os, subprocess, sys, tempfile from bup import bloom, git, midx +from bup.compat import range from bup.git import MissingObject, walk_object from bup.helpers import Nonlocal, log, progress, qprogress from os.path import basename @@ -159,7 +160,7 @@ def sweep(live_objects, existing_count, cat_pipe, threshold, compression, idx = git.open_idx(idx_name) idx_live_count = 0 - for i in xrange(0, len(idx)): + for i in range(0, len(idx)): sha = idx.shatable[i * 20 : (i + 1) * 20] if live_objects.exists(sha): idx_live_count += 1 @@ -183,7 +184,7 @@ def sweep(live_objects, existing_count, cat_pipe, threshold, compression, if verbosity: log('rewriting %s (%.2f%% live)\n' % (basename(idx_name), live_frac * 100)) - for i in xrange(0, len(idx)): + for i in range(0, len(idx)): sha = idx.shatable[i * 20 : (i + 1) * 20] if live_objects.exists(sha): item_it = cat_pipe.get(sha.encode('hex')) diff --git a/lib/bup/git.py b/lib/bup/git.py index b8f96e9..8b37e61 100644 --- a/lib/bup/git.py +++ b/lib/bup/git.py @@ -10,6 +10,7 @@ from itertools import islice from numbers import Integral from bup import _helpers, compat, hashsplit, path, midx, bloom, xstat +from bup.compat import range from bup.helpers import (Sha1, add_error, chunkyreader, debug1, debug2, fdatasync, hostname, localtime, log, merge_iter, @@ -395,7 +396,7 @@ class PackIdxV1(PackIdx): return str(self.shatable[idx*24+4 : idx*24+24]) def __iter__(self): - for i in xrange(self.fanout[255]): + for i in range(self.fanout[255]): yield buffer(self.map, 256*4 + 24*i + 4, 20) @@ -430,7 +431,7 @@ class PackIdxV2(PackIdx): return str(self.shatable[idx*20:(idx+1)*20]) def __iter__(self): - for i in xrange(self.fanout[255]): + for i in range(self.fanout[255]): yield buffer(self.map, 8 + 256*4 + 20*i, 20) diff --git a/lib/bup/index.py b/lib/bup/index.py index d6d44ac..4dffd3a 100644 --- a/lib/bup/index.py +++ b/lib/bup/index.py @@ -4,6 +4,7 @@ import errno, os, stat, struct, tempfile from bup import metadata, xstat from bup._helpers import UINT_MAX, bytescmp +from bup.compat import range from bup.helpers import (add_error, log, merge_iter, mmap_readwrite, progress, qprogress, resolve_parent, slashappend) @@ -383,7 +384,7 @@ class ExistingEntry(Entry): ofs = self.children_ofs assert(ofs <= len(self._m)) assert(self.children_n <= UINT_MAX) # i.e. python struct 'I' - for i in xrange(self.children_n): + for i in range(self.children_n): eon = self._m.find('\0', ofs) assert(eon >= 0) assert(eon >= ofs) diff --git a/lib/bup/midx.py b/lib/bup/midx.py index a24b104..0b41837 100644 --- a/lib/bup/midx.py +++ b/lib/bup/midx.py @@ -3,6 +3,7 @@ from __future__ import absolute_import import glob, mmap, os, struct from bup import _helpers +from bup.compat import range from bup.helpers import log, mmap_read @@ -115,7 +116,7 @@ class PackMidx: return None def __iter__(self): - for i in xrange(self._fanget(self.entries-1)): + for i in range(self._fanget(self.entries-1)): yield buffer(self.shatable, i*20, 20) def __len__(self): diff --git a/lib/bup/t/tgit.py b/lib/bup/t/tgit.py index dc49330..599aaf6 100644 --- a/lib/bup/t/tgit.py +++ b/lib/bup/t/tgit.py @@ -6,6 +6,7 @@ import struct, os, time from wvtest import * from bup import git +from bup.compat import range from bup.helpers import localtime, log, mkdirp, readpipe from buptest import no_lingering_errors, test_tempdir @@ -73,7 +74,7 @@ def testencode(): WVPASSEQ(git._decode_packobj(packb), ('blob', s)) WVPASSEQ(git._decode_packobj(packt), ('tree', s)) WVPASSEQ(git._decode_packobj(packc), ('commit', s)) - for i in xrange(10): + for i in range(10): WVPASS(git._encode_looseobj('blob', s, compression_level=i)) def encode_pobj(n): return ''.join(git._encode_packobj('blob', s, compression_level=n)) @@ -170,7 +171,7 @@ def test_long_index(): 0x22334455, 0x66778899, 0x00112233, 0x44556677, 0x88990011) pack_bin = struct.pack('!IIIII', 0x99887766, 0x55443322, 0x11009988, 0x77665544, 0x33221100) - idx = list(list() for i in xrange(256)) + idx = list(list() for i in range(256)) idx[0].append((obj_bin, 1, 0xfffffffff)) idx[0x11].append((obj2_bin, 2, 0xffffffffff)) idx[0x22].append((obj3_bin, 3, 0xff)) diff --git a/lib/bup/t/tmetadata.py b/lib/bup/t/tmetadata.py index 6b0b1e4..347f874 100644 --- a/lib/bup/t/tmetadata.py +++ b/lib/bup/t/tmetadata.py @@ -6,6 +6,7 @@ from wvtest import * from bup import git, metadata from bup import vfs +from bup.compat import range from bup.helpers import clear_errors, detect_fakeroot, is_superuser, resolve_parent from bup.repo import LocalRepo from bup.xstat import utime, lutime @@ -230,7 +231,7 @@ def test_apply_to_path_restricted_access(): if metadata.xattr and m.linux_xattr: expected_errors.append("xattr.set '") WVPASS(len(helpers.saved_errors) == len(expected_errors)) - for i in xrange(len(expected_errors)): + for i in range(len(expected_errors)): WVPASS(str(helpers.saved_errors[i]).startswith(expected_errors[i])) clear_errors()