Remove last xrange - no more in scapy

Author: gpotter2

CONTRIBUTING.md

@@ -72,7 +72,7 @@ guidelines for new code.
   - [Google Python Style Guide](https://google.github.io/styleguide/pyguide.html)
     is a nice read!
   - Avoid creating unnecessary `list` objects, particularly if they
-    can be huge (e.g., when possible, use `xrange()` instead of
+    can be huge (e.g., when possible, use `scapy.modules.six.range()` instead of
     `range()`, `for line in fdesc` instead of `for line in
     fdesc.readlines()`; more generally prefer generators over lists).
 
@@ -118,9 +118,9 @@ The project aims to provide code that works both on Python 2 and Python 3. There
 - lambdas must be written using a single argument when using tuples: use `lambda x_y: x_y[0] + f(x_y[1])` instead of `lambda (x, y): x + f(y)`.
 - use int instead of long
 - use list comprehension instead of map() and filter()
-- use six.range instead of xrange and range
-- use six.itervalues(dict) instead of dict.values() or dict.itervalues()
-- use six.string_types instead of basestring
+- use scapy.modules.six.range instead of xrange and range
+- use scapy.modules.six.itervalues(dict) instead of dict.values() or dict.itervalues()
+- use scapy.modules.six.string_types instead of basestring
 
 ### Code review
 

scapy/base_classes.py

@@ -28,7 +28,7 @@ def __init__(self, values, _iterpacket=1):
             self.values = list(values)
         elif (isinstance(values, tuple) and (2 <= len(values) <= 3) and \
              all(hasattr(i, "__int__") for i in values)):
-            # We use values[1] + 1 as stop value for xrange to maintain
+            # We use values[1] + 1 as stop value for (x)range to maintain
             # the behavior of using tuples as field `values`
             self.values = [range(*((int(values[0]), int(values[1]) + 1)
                                     + tuple(int(v) for v in values[2:])))]
@@ -40,7 +40,7 @@ def __iter__(self):
         for i in self.values:
             if (isinstance(i, Gen) and
                 (self._iterpacket or not isinstance(i,BasePacket))) or (
-                    isinstance(i, (xrange, types.GeneratorType))):
+                    isinstance(i, (range, types.GeneratorType))):
                 for j in i:
                     yield j
             else:

scapy/layers/dns.py

@@ -470,7 +470,7 @@ def RRlist2bitmap(lst):
 		b"B",
 		sum(2 ** (7 - (x - 256 * wb) + (tmp * 8)) for x in rrlist
 		if 256 * wb + 8 * tmp <= x < 256 * wb + 8 * tmp + 8),
-	    ) for tmp in xrange(bytes_count)
+	    ) for tmp in range(bytes_count)
 	)
 
     return bitmap

scapy/utils.py

@@ -351,13 +351,13 @@ def randstring(l):
     """
     Returns a random string of length l (l >= 0)
     """
-    return b"".join(struct.pack('B', random.randint(0, 255)) for _ in xrange(l))
+    return b"".join(struct.pack('B', random.randint(0, 255)) for _ in range(l))
 
 def zerofree_randstring(l):
     """
     Returns a random string of length l (l >= 0) without zero in it.
     """
-    return b"".join(struct.pack('B', random.randint(1, 255)) for _ in xrange(l))
+    return b"".join(struct.pack('B', random.randint(1, 255)) for _ in range(l))
 
 def strxor(s1, s2):
     """

scapy/volatile.py

@@ -343,7 +343,7 @@ def _fix(self):
                 if i == "*":
                     oid.append(str(self.idnum))
                 elif i == "**":
-                    oid += [str(self.idnum) for i in xrange(1 + self.depth)]
+                    oid += [str(self.idnum) for i in range(1 + self.depth)]
                 elif isinstance(i, tuple):
                     oid.append(str(random.randrange(*i)))
                 else:
@@ -377,7 +377,7 @@ def choice_expand(s): #XXX does not support special sets like (ex ':alnum:')
                 s = s[:p-1]+rng+s[p+1:]
         res = m+s
         if invert:
-            res = "".join(chr(x) for x in xrange(256) if chr(x) not in res)
+            res = "".join(chr(x) for x in range(256) if chr(x) not in res)
         return res
 
     @staticmethod