removed usage of longs, updated int instance checking and octal constants to be 2/3 compliant

daemon/core/nodes/base.py

@@ -559,7 +559,6 @@ class CoreNode(CoreNodeBase):
             finally:
                 self.rmnodedir()
 
-
     def cmd(self, args, wait=True):
         """
         Runs shell command on node, with option to not wait for a result.
@@ -928,10 +927,10 @@ class CoreNode(CoreNodeBase):
         hostfilename = self.hostfilename(filename)
         dirname, _basename = os.path.split(hostfilename)
         if not os.path.isdir(dirname):
-            os.makedirs(dirname, mode=0755)
+            os.makedirs(dirname, mode=0o755)
         return open(hostfilename, mode)
 
-    def nodefile(self, filename, contents, mode=0644):
+    def nodefile(self, filename, contents, mode=0o644):
         """
         Create a node file with a given mode.
 

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 int
 from builtins import range
 
 from core import CoreCommandError, utils

daemon/core/nodes/ipaddress.py

@@ -44,12 +44,12 @@ class MacAddress(object):
         if not self.addr:
             return IpAddress.from_string("::")
         tmp = struct.unpack("!Q", "\x00\x00" + self.addr)[0]
-        nic = long(tmp) & 0x000000FFFFFFL
-        oui = long(tmp) & 0xFFFFFF000000L
+        nic = long(tmp) & 0x000000FFFFFF
+        oui = long(tmp) & 0xFFFFFF000000
         # toggle U/L bit
-        oui ^= 0x020000000000L
+        oui ^= 0x020000000000
         # append EUI-48 octets
-        oui = (oui << 16) | 0xFFFE000000L
+        oui = (oui << 16) | 0xFFFE000000
         return IpAddress(AF_INET6, struct.pack("!QQ", 0xfe80 << 48, oui | nic))
 
     @classmethod
@@ -234,7 +234,7 @@ class IpPrefix(object):
         self.prefix = socket.inet_pton(self.af, tmp[0])
         if self.addrlen > self.prefixlen:
             addrbits = self.addrlen - self.prefixlen
-            netmask = ((1L << self.prefixlen) - 1) << addrbits
+            netmask = ((1 << self.prefixlen) - 1) << addrbits
             prefix = ""
             for i in range(-1, -(addrbits >> 3) - 2, -1):
                 prefix = chr(ord(self.prefix[i]) & (netmask & 0xff)) + prefix
@@ -376,7 +376,7 @@ class IpPrefix(object):
         :rtype: str
         """
         addrbits = self.addrlen - self.prefixlen
-        netmask = ((1L << self.prefixlen) - 1) << addrbits
+        netmask = ((1 << self.prefixlen) - 1) << addrbits
         netmaskbytes = struct.pack("!L", netmask)
         return IpAddress(af=AF_INET, address=netmaskbytes).__str__()
 

daemon/core/nodes/physical.py

@@ -234,12 +234,12 @@ class PhysicalNode(CoreNodeBase):
         dirname = dirname.replace("/", ".")
         dirname = os.path.join(self.nodedir, dirname)
         if not os.path.isdir(dirname):
-            os.makedirs(dirname, mode=0755)
+            os.makedirs(dirname, mode=0o755)
 
         hostfilename = os.path.join(dirname, basename)
         return open(hostfilename, mode)
 
-    def nodefile(self, filename, contents, mode=0644):
+    def nodefile(self, filename, contents, mode=0o644):
         with self.opennodefile(filename, "w") as node_file:
             node_file.write(contents)
             os.chmod(node_file.name, mode)