updated usages of super to use python3 variation

This commit is contained in:
bharnden 2019-10-23 09:51:52 -07:00
parent 6a0a9e7698
commit 68be311c7a
15 changed files with 33 additions and 40 deletions

View file

@ -62,7 +62,7 @@ class EmaneManager(ModelManager):
:param core.session.Session session: session this manager is tied to
:return: nothing
"""
super(EmaneManager, self).__init__()
super().__init__()
self.session = session
self._emane_nets = {}
self._emane_node_lock = threading.Lock()
@ -128,7 +128,7 @@ class EmaneManager(ModelManager):
return config
def config_reset(self, node_id=None):
super(EmaneManager, self).config_reset(node_id)
super().config_reset(node_id)
self.set_configs(self.emane_config.default_values())
def emane_check(self):
@ -871,7 +871,7 @@ class EmaneGlobalModel(EmaneModel):
]
def __init__(self, session, _id=None):
super(EmaneGlobalModel, self).__init__(session, _id)
super().__init__(session, _id)
def build_xml_files(self, config, interface=None):
raise NotImplementedError

View file

@ -19,4 +19,4 @@ class EmaneIeee80211abgModel(emanemodel.EmaneModel):
cls.mac_defaults["pcrcurveuri"] = os.path.join(
emane_prefix, "share/emane/xml/models/mac/ieee80211abg/ieee80211pcr.xml"
)
super(EmaneIeee80211abgModel, cls).load(emane_prefix)
super().load(emane_prefix)

View file

@ -30,7 +30,7 @@ class EmaneNet(CoreNetworkBase):
is_emane = True
def __init__(self, session, _id=None, name=None, start=True, server=None):
super(EmaneNet, self).__init__(session, _id, name, start, server)
super().__init__(session, _id, name, start, server)
self.conf = ""
self.up = False
self.nemidmap = {}

View file

@ -19,4 +19,4 @@ class EmaneRfPipeModel(emanemodel.EmaneModel):
cls.mac_defaults["pcrcurveuri"] = os.path.join(
emane_prefix, "share/emane/xml/models/mac/rfpipe/rfpipepcr.xml"
)
super(EmaneRfPipeModel, cls).load(emane_prefix)
super().load(emane_prefix)

View file

@ -32,7 +32,7 @@ class EmaneTdmaModel(emanemodel.EmaneModel):
emane_prefix,
"share/emane/xml/models/mac/tdmaeventscheduler/tdmabasemodelpcr.xml",
)
super(EmaneTdmaModel, cls).load(emane_prefix)
super().load(emane_prefix)
cls.mac_config.insert(
0,
Configuration(