Change to use super() instead of the old py2 style everywhere

This commit is contained in:
Griatch 2022-01-26 21:45:28 +01:00
parent 55237f20a7
commit 5859de7054
33 changed files with 69 additions and 70 deletions

View file

@ -2661,7 +2661,7 @@ class OLCMenu(EvMenu):
Format the node text itself.
"""
return super(OLCMenu, self).nodetext_formatter(nodetext)
return super().nodetext_formatter(nodetext)
def options_formatter(self, optionlist):
"""
@ -2697,7 +2697,7 @@ class OLCMenu(EvMenu):
if olc_options
else ""
)
other_options = super(OLCMenu, self).options_formatter(other_options)
other_options = super().options_formatter(other_options)
sep = "\n\n" if olc_options and other_options else ""
return "{}{}{}".format(olc_options, sep, other_options)

View file

@ -47,7 +47,7 @@ _PROTPARENTS = {
class TestSpawner(BaseEvenniaTest):
def setUp(self):
super(TestSpawner, self).setUp()
super().setUp()
self.prot1 = {
"prototype_key": "testprototype",
"typeclass": "evennia.objects.objects.DefaultObject",
@ -309,7 +309,7 @@ class TestUtils(BaseEvenniaTest):
class TestProtLib(BaseEvenniaTest):
def setUp(self):
super(TestProtLib, self).setUp()
super().setUp()
self.obj1.attributes.add("testattr", "testval")
self.prot = spawner.prototype_from_object(self.obj1)
@ -357,7 +357,7 @@ class TestProtFuncs(BaseEvenniaTest):
class TestPrototypeStorage(BaseEvenniaTest):
def setUp(self):
super(TestPrototypeStorage, self).setUp()
super().setUp()
self.maxDiff = None
self.prot1 = spawner.prototype_from_object(self.obj1)
@ -442,7 +442,7 @@ class TestMenuModule(BaseEvenniaTest):
maxDiff = None
def setUp(self):
super(TestMenuModule, self).setUp()
super().setUp()
# set up fake store
self.caller = self.char1