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)
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
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))
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)
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:
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)
# 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)
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')
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')
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
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
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'))
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,
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)
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)
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)
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)
import glob, mmap, os, struct
from bup import _helpers
+from bup.compat import range
from bup.helpers import log, mmap_read
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):
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
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))
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))
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
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()