Remove and replace compat.xrange

8 files changed, 11 insertions, 24 deletions

diff --git a/gitdb/db/pack.py b/gitdb/db/pack.py
index 1e37d73..177ed7b 100644
--- a/gitdb/db/pack.py
+++ b/gitdb/db/pack.py
@@ -18,7 +18,6 @@ from gitdb.exc import (
 )
 
 from gitdb.pack import PackEntity
-from gitdb.utils.compat import xrange
 
 from functools import reduce
 
@@ -107,7 +106,7 @@ class PackedDB(FileDBBase, ObjectDBR, CachingDB, LazyMixin):
         for entity in self.entities():
             index = entity.index()
             sha_by_index = index.sha
-            for index in xrange(index.size()):
+            for index in range(index.size()):
                 yield sha_by_index(index)
             # END for each index
         # END for each entity
diff --git a/gitdb/fun.py b/gitdb/fun.py
index 3a2248f..7203de9 100644
--- a/gitdb/fun.py
+++ b/gitdb/fun.py
@@ -16,7 +16,7 @@ from functools import reduce
 
 from gitdb.const import NULL_BYTE, BYTE_SPACE
 from gitdb.utils.encoding import force_text
-from gitdb.utils.compat import buffer, xrange, PY3
+from gitdb.utils.compat import buffer, PY3
 from gitdb.typ import (
     str_blob_type,
     str_commit_type,
@@ -264,7 +264,7 @@ class DeltaChunkList(list):
                     # if first_data_index is not None:
                     nd = StringIO()                     # new data
                     so = self[first_data_index].to      # start offset in target buffer
-                    for x in xrange(first_data_index, i - 1):
+                    for x in range(first_data_index, i - 1):
                         xdc = self[x]
                         nd.write(xdc.data[:xdc.ts])
                     # END collect data
diff --git a/gitdb/pack.py b/gitdb/pack.py
index 748df38..f010554 100644
--- a/gitdb/pack.py
+++ b/gitdb/pack.py
@@ -64,7 +64,6 @@ from binascii import crc32
 from gitdb.const import NULL_BYTE
 from gitdb.utils.compat import (
     buffer, 
-    xrange,
     to_bytes
 )
 
@@ -206,7 +205,7 @@ class IndexWriter(object):
         for t in self._objs:
             tmplist[byte_ord(t[0][0])] += 1
         # END prepare fanout
-        for i in xrange(255):
+        for i in range(255):
             v = tmplist[i]
             sha_write(pack('>L', v))
             tmplist[i + 1] += v
@@ -375,7 +374,7 @@ class PackIndexFile(LazyMixin):
         d = self._cursor.map()
         out = list()
         append = out.append
-        for i in xrange(256):
+        for i in range(256):
             append(unpack_from('>L', d, byte_offset + i * 4)[0])
         # END for each entry
         return out
@@ -416,7 +415,7 @@ class PackIndexFile(LazyMixin):
                 a.byteswap()
             return a
         else:
-            return tuple(self.offset(index) for index in xrange(self.size()))
+            return tuple(self.offset(index) for index in range(self.size()))
         # END handle version
 
     def sha_to_index(self, sha):
@@ -715,7 +714,7 @@ class PackEntity(LazyMixin):
         """Iterate over all objects in our index and yield their OInfo or OStream instences"""
         _sha = self._index.sha
         _object = self._object
-        for index in xrange(self._index.size()):
+        for index in range(self._index.size()):
             yield _object(_sha(index), as_stream, index)
         # END for each index
 
diff --git a/gitdb/test/db/lib.py b/gitdb/test/db/lib.py
index 528bcc1..c6f4316 100644
--- a/gitdb/test/db/lib.py
+++ b/gitdb/test/db/lib.py
@@ -23,7 +23,6 @@ from gitdb.base import (
 
 from gitdb.exc import BadObject
 from gitdb.typ import str_blob_type
-from gitdb.utils.compat import xrange
 
 from io import BytesIO
 
@@ -45,7 +44,7 @@ class TestDBBase(TestBase):
         # write a bunch of objects and query their streams and info
         null_objs = db.size()
         ni = 250
-        for i in xrange(ni):
+        for i in range(ni):
             data = pack(">L", i)
             istream = IStream(str_blob_type, len(data), BytesIO(data))
             new_istream = db.store(istream)
diff --git a/gitdb/test/lib.py b/gitdb/test/lib.py
index 42b9ddc..a04084f 100644
--- a/gitdb/test/lib.py
+++ b/gitdb/test/lib.py
@@ -4,7 +4,6 @@
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Utilities used in ODB testing"""
 from gitdb import OStream
-from gitdb.utils.compat import xrange
 
 import sys
 import random
@@ -151,7 +150,7 @@ def make_bytes(size_in_bytes, randomize=False):
     """:return: string with given size in bytes
     :param randomize: try to produce a very random stream"""
     actual_size = size_in_bytes // 4
-    producer = xrange(actual_size)
+    producer = range(actual_size)
     if randomize:
         producer = list(producer)
         random.shuffle(producer)
diff --git a/gitdb/test/performance/test_pack.py b/gitdb/test/performance/test_pack.py
index fc8d9d5..b59d5a9 100644
--- a/gitdb/test/performance/test_pack.py
+++ b/gitdb/test/performance/test_pack.py
@@ -17,7 +17,6 @@ from gitdb import (
 from gitdb.typ import str_blob_type
 from gitdb.exc import UnsupportedOperation
 from gitdb.db.pack import PackedDB
-from gitdb.utils.compat import xrange
 from gitdb.test.lib import skip_on_travis_ci
 
 import sys
@@ -118,7 +117,7 @@ class TestPackedDBPerformance(TestBigRepoR):
             for entity in pdb.entities():
                 pack_verify = entity.is_valid_stream
                 sha_by_index = entity.index().sha
-                for index in xrange(entity.index().size()):
+                for index in range(entity.index().size()):
                     try:
                         assert pack_verify(sha_by_index(index), use_crc=crc)
                         count += 1
diff --git a/gitdb/test/test_pack.py b/gitdb/test/test_pack.py
index dd1c830..8bf78f0 100644
--- a/gitdb/test/test_pack.py
+++ b/gitdb/test/test_pack.py
@@ -25,7 +25,6 @@ from gitdb.base import (
 from gitdb.fun import delta_types
 from gitdb.exc import UnsupportedOperation
 from gitdb.util import to_bin_sha
-from gitdb.utils.compat import xrange
 
 from nose import SkipTest
 
@@ -58,7 +57,7 @@ class TestPack(TestBase):
         assert len(index.offsets()) == size
 
         # get all data of all objects
-        for oidx in xrange(index.size()):
+        for oidx in range(index.size()):
             sha = index.sha(oidx)
             assert oidx == index.sha_to_index(sha)
 
diff --git a/gitdb/utils/compat.py b/gitdb/utils/compat.py
index 586f3bb..99e7ae6 100644
--- a/gitdb/utils/compat.py
+++ b/gitdb/utils/compat.py
@@ -3,13 +3,6 @@ import sys
 PY3 = sys.version_info[0] == 3
 
 try:
-    xrange = xrange
-except ImportError:
-    # py3
-    xrange = range
-# end handle python version
-
-try:
     # Python 2
     buffer = buffer
     memoryview = buffer