Drop vestigial compat.range

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/dev/make-random-paths b/dev/make-random-paths
index c0c6c78736c70a87bfc09216b0b41027a14feac8..d112ba74bf838029b955641147060d4522466eed 100755 (executable)
--- 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 8af357f53071ad5562ac778612bbe32ce66316c5..0942be0ca9c4c25398487292ff8c01f02041927a 100644 (file)
--- 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 1bd2aa191addcafabdb8b7390f698f6680536b9b..f1b38a865164bec5f9051d152e6e188be394a443 100755 (executable)
--- 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 e20c1b67806f272f940a6d9e422e243a0e011bf8..6790410dbfdbf11f0f560d69a1717e8c34ec4626 100755 (executable)
--- 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 9d3b6372bacdbfe622da205513c49006e91465bf..81ffae71f5a2dd845d159139032f24c42455c599 100755 (executable)
--- 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 3b460ededde4a1cde1fb65398d7a776082cfe3de..507a21e5367c1cfb4a66f4e78839ba3d8a7a9101 100644 (file)
--- 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 5946e66c5112dc55cf50d1b0ff93377b5cf1fdb6..0e8008fc84e9abba00a2f17d17b2ce82c9da9d97 100644 (file)
--- 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 965b6d072228ff9c6fdaa752cd280c4bf881ec2b..0856699db5bb31bc2c72f901df8422e342716c39 100644 (file)
--- 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 3941a5ca6b248e516b1e2d7ab010e30ae5b3e7f5..d7c67fb89b4371562caf682780cf37198fd1ac09 100644 (file)
--- 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 1b3708e81fe0b714736f9aaba65bc5f5a86d30be..c59999da628ca7c2dbc5037598bd2e97d88568e4 100644 (file)
--- 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 ea150992ecf06aa599b3345acbbe54fa765353ea..a16fb50a6483a8687323f956699bbfc4100742af 100644 (file)
--- 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 de17ecea74c682fa6ea1a44e72811b3b0b7709cb..40580b33610bc462e27396ca969fde7de68a5647 100644 (file)
--- 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 2d9fcd7bd775144972101107cc1bd2d7ce4aed66..d7da81273e995d3c27874d3f3d626220b84f91ae 100644 (file)
--- 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 b3ff3a5eff764303c24ca98f044a30f4f16586bd..3fefbd4ef3e5e7b10d4618b3d1f120119de947c0 100644 (file)
--- 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 010b39ec994658dd0f16af9c3bbfb2d690cc35f8..bf79a31248c6195e7e3f82c061b3add1f0ef7ac1 100644 (file)
--- 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