added future library to support python2/3, updated xrange calls to leverage builtins range

daemon/core/nodes/base.py

@@ -11,16 +11,17 @@ import signal
 import socket
 import string
 import threading
+from builtins import range
 from socket import AF_INET, AF_INET6
 
 from core import CoreCommandError, utils
 from core import constants
 from core.emulator.data import NodeData, LinkData
 from core.emulator.enumerations import NodeTypes, LinkTypes
-from core.nodes.ipaddress import MacAddress
 from core.nodes import client, nodeutils, ipaddress
 from core.nodes.interface import TunTap, CoreInterface
 from core.nodes.interface import Veth
+from core.nodes.ipaddress import MacAddress
 
 _DEFAULT_MTU = 1500
 
@@ -868,8 +869,8 @@ class CoreNode(CoreNodeBase):
         :return: nothing
         """
         tmplen = 8
-        tmp1 = "tmp." + "".join([random.choice(string.ascii_lowercase) for _ in xrange(tmplen)])
-        tmp2 = "tmp." + "".join([random.choice(string.ascii_lowercase) for _ in xrange(tmplen)])
+        tmp1 = "tmp." + "".join([random.choice(string.ascii_lowercase) for _ in range(tmplen)])
+        tmp2 = "tmp." + "".join([random.choice(string.ascii_lowercase) for _ in range(tmplen)])
         utils.check_cmd([constants.IP_BIN, "link", "add", "name", tmp1, "type", "veth", "peer", "name", tmp2])
 
         utils.check_cmd([constants.IP_BIN, "link", "set", tmp1, "netns", str(self.pid)])

daemon/core/nodes/interface.py

@@ -4,6 +4,7 @@ virtual ethernet classes that implement the interfaces available under Linux.
 
 import logging
 import time
+from builtins import range
 
 from core import CoreCommandError, utils
 from core import constants
@@ -300,7 +301,7 @@ class TunTap(CoreInterface):
         """
         delay = 0.01
         result = False
-        for i in xrange(1, attempts + 1):
+        for i in range(1, attempts + 1):
             r = func()
             if r == 0:
                 result = True

daemon/core/nodes/ipaddress.py

@@ -6,6 +6,7 @@ import logging
 import random
 import socket
 import struct
+from builtins import range
 from socket import AF_INET
 from socket import AF_INET6
 
@@ -154,7 +155,7 @@ class IpAddress(object):
             return NotImplemented
 
         tmp = [ord(x) for x in self.addr]
-        for i in xrange(len(tmp) - 1, -1, -1):
+        for i in range(len(tmp) - 1, -1, -1):
             x = tmp[i] + carry
             tmp[i] = x & 0xff
             carry = x >> 8
@@ -235,7 +236,7 @@ class IpPrefix(object):
             addrbits = self.addrlen - self.prefixlen
             netmask = ((1L << self.prefixlen) - 1) << addrbits
             prefix = ""
-            for i in xrange(-1, -(addrbits >> 3) - 2, -1):
+            for i in range(-1, -(addrbits >> 3) - 2, -1):
                 prefix = chr(ord(self.prefix[i]) & (netmask & 0xff)) + prefix
                 netmask >>= 8
             self.prefix = self.prefix[:i] + prefix
@@ -319,7 +320,7 @@ class IpPrefix(object):
 
         addr = ""
         prefix_endpoint = -1
-        for i in xrange(-1, -(self.addrlen >> 3) - 1, -1):
+        for i in range(-1, -(self.addrlen >> 3) - 1, -1):
             prefix_endpoint = i
             addr = chr(ord(self.prefix[i]) | (tmp & 0xff)) + addr
             tmp >>= 8