Skip to content

Commit 4a692fd

Browse files
committed
Remove and replace compat.xrange
1 parent 73a9f79 commit 4a692fd

File tree

8 files changed

+11
-24
lines changed

8 files changed

+11
-24
lines changed

gitdb/db/pack.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
)
1919

2020
from gitdb.pack import PackEntity
21-
from gitdb.utils.compat import xrange
2221

2322
from functools import reduce
2423

@@ -107,7 +106,7 @@ def sha_iter(self):
107106
for entity in self.entities():
108107
index = entity.index()
109108
sha_by_index = index.sha
110-
for index in xrange(index.size()):
109+
for index in range(index.size()):
111110
yield sha_by_index(index)
112111
# END for each index
113112
# END for each entity

gitdb/fun.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from gitdb.const import NULL_BYTE, BYTE_SPACE
1818
from gitdb.utils.encoding import force_text
19-
from gitdb.utils.compat import buffer, xrange, PY3
19+
from gitdb.utils.compat import buffer, PY3
2020
from gitdb.typ import (
2121
str_blob_type,
2222
str_commit_type,
@@ -264,7 +264,7 @@ def compress(self):
264264
# if first_data_index is not None:
265265
nd = StringIO() # new data
266266
so = self[first_data_index].to # start offset in target buffer
267-
for x in xrange(first_data_index, i - 1):
267+
for x in range(first_data_index, i - 1):
268268
xdc = self[x]
269269
nd.write(xdc.data[:xdc.ts])
270270
# END collect data

gitdb/pack.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
from gitdb.const import NULL_BYTE
6565
from gitdb.utils.compat import (
6666
buffer,
67-
xrange,
6867
to_bytes
6968
)
7069

@@ -206,7 +205,7 @@ def write(self, pack_sha, write):
206205
for t in self._objs:
207206
tmplist[byte_ord(t[0][0])] += 1
208207
# END prepare fanout
209-
for i in xrange(255):
208+
for i in range(255):
210209
v = tmplist[i]
211210
sha_write(pack('>L', v))
212211
tmplist[i + 1] += v
@@ -375,7 +374,7 @@ def _read_fanout(self, byte_offset):
375374
d = self._cursor.map()
376375
out = list()
377376
append = out.append
378-
for i in xrange(256):
377+
for i in range(256):
379378
append(unpack_from('>L', d, byte_offset + i * 4)[0])
380379
# END for each entry
381380
return out
@@ -416,7 +415,7 @@ def offsets(self):
416415
a.byteswap()
417416
return a
418417
else:
419-
return tuple(self.offset(index) for index in xrange(self.size()))
418+
return tuple(self.offset(index) for index in range(self.size()))
420419
# END handle version
421420

422421
def sha_to_index(self, sha):
@@ -715,7 +714,7 @@ def _iter_objects(self, as_stream):
715714
"""Iterate over all objects in our index and yield their OInfo or OStream instences"""
716715
_sha = self._index.sha
717716
_object = self._object
718-
for index in xrange(self._index.size()):
717+
for index in range(self._index.size()):
719718
yield _object(_sha(index), as_stream, index)
720719
# END for each index
721720

gitdb/test/db/lib.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
from gitdb.exc import BadObject
2525
from gitdb.typ import str_blob_type
26-
from gitdb.utils.compat import xrange
2726

2827
from io import BytesIO
2928

@@ -45,7 +44,7 @@ def _assert_object_writing_simple(self, db):
4544
# write a bunch of objects and query their streams and info
4645
null_objs = db.size()
4746
ni = 250
48-
for i in xrange(ni):
47+
for i in range(ni):
4948
data = pack(">L", i)
5049
istream = IStream(str_blob_type, len(data), BytesIO(data))
5150
new_istream = db.store(istream)

gitdb/test/lib.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# the New BSD License: http://www.opensource.org/licenses/bsd-license.php
55
"""Utilities used in ODB testing"""
66
from gitdb import OStream
7-
from gitdb.utils.compat import xrange
87

98
import sys
109
import random
@@ -151,7 +150,7 @@ def make_bytes(size_in_bytes, randomize=False):
151150
""":return: string with given size in bytes
152151
:param randomize: try to produce a very random stream"""
153152
actual_size = size_in_bytes // 4
154-
producer = xrange(actual_size)
153+
producer = range(actual_size)
155154
if randomize:
156155
producer = list(producer)
157156
random.shuffle(producer)

gitdb/test/performance/test_pack.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from gitdb.typ import str_blob_type
1818
from gitdb.exc import UnsupportedOperation
1919
from gitdb.db.pack import PackedDB
20-
from gitdb.utils.compat import xrange
2120
from gitdb.test.lib import skip_on_travis_ci
2221

2322
import sys
@@ -118,7 +117,7 @@ def test_correctness(self):
118117
for entity in pdb.entities():
119118
pack_verify = entity.is_valid_stream
120119
sha_by_index = entity.index().sha
121-
for index in xrange(entity.index().size()):
120+
for index in range(entity.index().size()):
122121
try:
123122
assert pack_verify(sha_by_index(index), use_crc=crc)
124123
count += 1

gitdb/test/test_pack.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
from gitdb.fun import delta_types
2626
from gitdb.exc import UnsupportedOperation
2727
from gitdb.util import to_bin_sha
28-
from gitdb.utils.compat import xrange
2928

3029
from nose import SkipTest
3130

@@ -58,7 +57,7 @@ def _assert_index_file(self, index, version, size):
5857
assert len(index.offsets()) == size
5958

6059
# get all data of all objects
61-
for oidx in xrange(index.size()):
60+
for oidx in range(index.size()):
6261
sha = index.sha(oidx)
6362
assert oidx == index.sha_to_index(sha)
6463

gitdb/utils/compat.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22

33
PY3 = sys.version_info[0] == 3
44

5-
try:
6-
xrange = xrange
7-
except ImportError:
8-
# py3
9-
xrange = range
10-
# end handle python version
11-
125
try:
136
# Python 2
147
buffer = buffer

0 commit comments

Comments
 (0)