cleaned up core.emane, core.services, core.xml, fixed bug introduced in coreobj.py

daemon/core/emane/commeffect.py

@@ -25,7 +25,7 @@ def convert_none(x):
     """
     Helper to use 0 for None values.
     """
-    if type(x) is str:
+    if isinstance(x, basestring):
         x = float(x)
     if x is None:
         return 0

daemon/core/emane/emanemanager.py

@@ -627,11 +627,11 @@ class EmaneManager(ModelManager):
         if realtime:
             emanecmd += "-r",
 
-        otagroup, otaport = self.get_config("otamanagergroup").split(":")
+        otagroup, _otaport = self.get_config("otamanagergroup").split(":")
         otadev = self.get_config("otamanagerdevice")
         otanetidx = self.session.get_control_net_index(otadev)
 
-        eventgroup, eventport = self.get_config("eventservicegroup").split(":")
+        eventgroup, _eventport = self.get_config("eventservicegroup").split(":")
         eventdev = self.get_config("eventservicedevice")
         eventservicenetidx = self.session.get_control_net_index(eventdev)
 
@@ -781,7 +781,7 @@ class EmaneManager(ModelManager):
             return
         logger.info("subscribing to EMANE location events. (%s)", threading.currentThread().getName())
         while self.doeventloop is True:
-            uuid, seq, events = self.service.nextEvent()
+            _uuid, _seq, events = self.service.nextEvent()
 
             # this occurs with 0.9.1 event service
             if not self.doeventloop:
@@ -820,7 +820,7 @@ class EmaneManager(ModelManager):
         Returns True if successfully parsed and a Node Message was sent.
         """
         # convert nemid to node number
-        emanenode, netif = self.nemlookup(nemid)
+        _emanenode, netif = self.nemlookup(nemid)
         if netif is None:
             logger.info("location event for unknown NEM %s", nemid)
             return False

daemon/core/emane/nodes.py

@@ -37,7 +37,7 @@ class EmaneNode(EmaneNet):
     """
 
     def __init__(self, session, objid=None, name=None, start=True):
-        PyCoreNet.__init__(self, session, objid, name, start)
+        super(EmaneNode, self).__init__(session, objid, name, start)
         self.conf = ""
         self.up = False
         self.nemidmap = {}