updates to rename utils.hash to utils.hashkey to avoid builtin conflict

daemon/core/api/tlv/broker.py

@@ -394,7 +394,7 @@ class CoreBroker(object):
             # this is the master session
             sid = self.session.id
 
-        key = (sid << 16) ^ utils.hash(n1num) ^ (utils.hash(n2num) << 8)
+        key = (sid << 16) ^ utils.hashkey(n1num) ^ (utils.hashkey(n2num) << 8)
         return key & 0xFFFFFFFF
 
     def addtunnel(self, remoteip, n1num, n2num, localnum):

daemon/core/utils.py

@@ -18,7 +18,7 @@ from core import CoreCommandError
 DEVNULL = open(os.devnull, "wb")
 
 
-def hash(value):
+def hashkey(value):
     """
     Provide a consistent hash that can be used in place
     of the builtin hash, that no longer behaves consistently