[PATCH 6/9] Drop vestigial compat.range

[Rob Browning]

Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
---
dev/make-random-paths | 2 +-
lib/bup/client.py | 2 +-
lib/bup/cmd/damage.py | 2 +-
lib/bup/cmd/memtest.py | 1 -
lib/bup/cmd/midx.py | 2 +-
lib/bup/compat.py | 1 -
lib/bup/git.py | 1 -
lib/bup/helpers.py | 4 ++--
lib/bup/index.py | 2 +-
lib/bup/midx.py | 2 +-
lib/bup/vfs.py | 2 +-
test/int/test_client.py | 2 +-
test/int/test_git.py | 2 +-
test/int/test_metadata.py | 1 -
test/int/test_vfs.py | 2 +-
15 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/dev/make-random-paths b/dev/make-random-paths
index c0c6c787..d112ba74 100755
--- a/dev/make-random-paths
+++ b/dev/make-random-paths
@@ -11,7 +11,7 @@ from random import randint
from sys import stderr, stdout
import errno, re, sys

-from bup.compat import fsencode, get_argv, get_argvb, range
+from bup.compat import fsencode, get_argv, get_argvb

argv = get_argv()

diff --git a/lib/bup/client.py b/lib/bup/client.py
index 8af357f5..0942be0c 100644
--- a/lib/bup/client.py
+++ b/lib/bup/client.py
@@ -7,7 +7,7 @@ import os, re, struct, time, zlib
import socket

from bup import git, ssh, vfs
-from bup.compat import environ, pending_raise, range, reraise
+from bup.compat import environ, pending_raise, reraise
from bup.helpers import (Conn, atomically_replaced_file, chunkyreader, debug1,
debug2, linereader, lines_until_sentinel,
mkdirp, nullcontext_if_not, progress, qprogress, DemuxConn)
diff --git a/lib/bup/cmd/damage.py b/lib/bup/cmd/damage.py
index 1bd2aa19..f1b38a86 100755
--- a/lib/bup/cmd/damage.py
+++ b/lib/bup/cmd/damage.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import
import os, random

from bup import options
-from bup.compat import argv_bytes, bytes_from_uint, range
+from bup.compat import argv_bytes, bytes_from_uint
from bup.helpers import log
from bup.io import path_msg

diff --git a/lib/bup/cmd/memtest.py b/lib/bup/cmd/memtest.py
index e20c1b67..6790410d 100755
--- a/lib/bup/cmd/memtest.py
+++ b/lib/bup/cmd/memtest.py
@@ -3,7 +3,6 @@ from __future__ import absolute_import, print_function
import re, resource, sys, time

from bup import git, bloom, midx, options, _helpers
-from bup.compat import range
from bup.io import byte_stream
from bup.helpers import log

diff --git a/lib/bup/cmd/midx.py b/lib/bup/cmd/midx.py
index 9d3b6372..81ffae71 100755
--- a/lib/bup/cmd/midx.py
+++ b/lib/bup/cmd/midx.py
@@ -4,7 +4,7 @@ from binascii import hexlify
import glob, os, math, resource, struct, sys

from bup import options, git, midx, _helpers, xstat
-from bup.compat import ExitStack, argv_bytes, hexstr, range
+from bup.compat import ExitStack, argv_bytes, hexstr
from bup.helpers import (Sha1, add_error, atomically_replaced_file, debug1, fdatasync,
log, mmap_readwrite, qprogress,
saved_errors, unlink)
diff --git a/lib/bup/compat.py b/lib/bup/compat.py
index 3b460ede..507a21e5 100644
--- a/lib/bup/compat.py
+++ b/lib/bup/compat.py
@@ -10,7 +10,6 @@ from os import environb as environ
from os import fsdecode, fsencode
from shlex import quote

-range = range
str_type = str
int_types = (int,)

diff --git a/lib/bup/git.py b/lib/bup/git.py
index 5946e66c..0e8008fc 100644
--- a/lib/bup/git.py
+++ b/lib/bup/git.py
@@ -17,7 +17,6 @@ from bup.compat import (buffer,
ExitStack,
items,
pending_raise,
- range,
reraise)
from bup.io import path_msg
from bup.helpers import (Sha1, add_error, chunkyreader, debug1, debug2,
diff --git a/lib/bup/helpers.py b/lib/bup/helpers.py
index 965b6d07..0856699d 100644
--- a/lib/bup/helpers.py
+++ b/lib/bup/helpers.py
@@ -829,7 +829,7 @@ if _mincore:
page_count = (st.st_size + sc_page_size - 1) // sc_page_size;
chunk_count = (st.st_size + _fmincore_chunk_size - 1) // _fmincore_chunk_size
result = bytearray(page_count)
- for ci in compat.range(chunk_count):
+ for ci in range(chunk_count):
pos = _fmincore_chunk_size * ci;
msize = min(_fmincore_chunk_size, st.st_size - pos)
try:
@@ -963,7 +963,7 @@ def columnate(l, prefix):
while len(l) % ncols:
l.append(nothing)
rows = len(l) // ncols
- for s in compat.range(0, len(l), rows):
+ for s in range(0, len(l), rows):
cols.append(l[s:s+rows])
out = nothing
fmt = b'%-*s' if binary else '%-*s'
diff --git a/lib/bup/index.py b/lib/bup/index.py
index 3941a5ca..d7c67fb8 100644
--- a/lib/bup/index.py
+++ b/lib/bup/index.py
@@ -4,7 +4,7 @@ import errno, os, stat, struct, tempfile

from bup import metadata, xstat
from bup._helpers import UINT_MAX, bytescmp
-from bup.compat import pending_raise, range
+from bup.compat import pending_raise
from bup.helpers import (add_error, log, merge_iter, mmap_readwrite,
progress, qprogress, resolve_parent, slashappend)

diff --git a/lib/bup/midx.py b/lib/bup/midx.py
index 1b3708e8..c59999da 100644
--- a/lib/bup/midx.py
+++ b/lib/bup/midx.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, print_function
import glob, os, struct

from bup import _helpers
-from bup.compat import pending_raise, range
+from bup.compat import pending_raise
from bup.helpers import log, mmap_read
from bup.io import path_msg

diff --git a/lib/bup/vfs.py b/lib/bup/vfs.py
index ea150992..a16fb50a 100644
--- a/lib/bup/vfs.py
+++ b/lib/bup/vfs.py
@@ -57,7 +57,7 @@ from time import localtime, strftime
import re, sys

from bup import git, vint
-from bup.compat import hexstr, pending_raise, range, str_type
+from bup.compat import hexstr, pending_raise, str_type
from bup.git import BUP_CHUNKED, parse_commit, tree_decode
from bup.helpers import debug2, last, nullcontext_if_not
from bup.io import path_msg
diff --git a/test/int/test_client.py b/test/int/test_client.py
index de17ecea..40580b33 100644
--- a/test/int/test_client.py
+++ b/test/int/test_client.py
@@ -4,7 +4,7 @@ import os, time, random, subprocess, glob
import pytest

from bup import client, git, path
-from bup.compat import bytes_from_uint, environ, range
+from bup.compat import bytes_from_uint, environ

def randbytes(sz):
s = b''
diff --git a/test/int/test_git.py b/test/int/test_git.py
index 2d9fcd7b..d7da8127 100644
--- a/test/int/test_git.py
+++ b/test/int/test_git.py
@@ -10,7 +10,7 @@ import pytest
from wvpytest import *

from bup import git, path
-from bup.compat import bytes_from_byte, environ, range
+from bup.compat import bytes_from_byte, environ
from bup.helpers import localtime, log, mkdirp, readpipe


diff --git a/test/int/test_metadata.py b/test/int/test_metadata.py
index b3ff3a5e..3fefbd4e 100644
--- a/test/int/test_metadata.py
+++ b/test/int/test_metadata.py
@@ -8,7 +8,6 @@ from wvpytest 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
diff --git a/test/int/test_vfs.py b/test/int/test_vfs.py
index 010b39ec..bf79a312 100644
--- a/test/int/test_vfs.py
+++ b/test/int/test_vfs.py
@@ -14,7 +14,7 @@ from wvpytest import *

from bup._helpers import write_random
from bup import git, metadata, vfs
-from bup.compat import environ, fsencode, items, range
+from bup.compat import environ, fsencode, items
from bup.helpers import exc, shstr
from bup.metadata import Metadata
from bup.repo import LocalRepo
--
2.30.2