From 5859de7054d8d03bea0b480ba2939a9f84176d39 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 26 Jan 2022 21:45:28 +0100
Subject: [PATCH] Change to use super() instead of the old py2 style everywhere

---
 .../workflows/github_action_build_docs.yml    |  3 +-
 docs/source/Contribs/Contrib-Building-Menu.md |  2 +-
 docs/source/Contribs/Contrib-Ingame-Python.md |  2 +-
 evennia/accounts/accounts.py                  |  2 +-
 evennia/accounts/tests.py                     |  2 +-
 evennia/commands/default/general.py           |  2 +-
 .../base_systems/building_menu/README.md      |  2 +-
 .../building_menu/building_menu.py            |  6 ++--
 .../base_systems/building_menu/tests.py       |  2 +-
 .../base_systems/ingame_python/README.md      |  2 +-
 .../contrib/game_systems/puzzles/puzzles.py   |  2 +-
 evennia/contrib/game_systems/puzzles/tests.py |  2 +-
 .../game_systems/turnbattle/tb_items.py       |  2 +-
 .../game_systems/turnbattle/tb_magic.py       |  2 +-
 .../game_systems/turnbattle/tb_range.py       |  2 +-
 .../contrib/game_systems/turnbattle/tests.py  | 34 +++++++++----------
 .../grid/extended_room/extended_room.py       |  2 +-
 .../contrib/tutorials/bodyfunctions/tests.py  |  4 +--
 evennia/contrib/utils/auditing/server.py      |  4 +--
 evennia/locks/tests.py                        |  2 +-
 evennia/prototypes/menus.py                   |  4 +--
 evennia/prototypes/tests.py                   |  8 ++---
 evennia/server/amp_client.py                  |  2 +-
 evennia/server/portal/amp.py                  | 10 +++---
 evennia/server/portal/amp_server.py           |  2 +-
 evennia/server/portal/telnet_ssl.py           |  2 +-
 evennia/server/portal/tests.py                |  4 +--
 evennia/server/serversession.py               |  2 +-
 evennia/server/tests/test_amp_connection.py   |  4 +--
 evennia/server/tests/testrunner.py            |  2 +-
 evennia/typeclasses/managers.py               |  6 ++--
 evennia/web/website/tests.py                  | 10 +++---
 evennia/web/website/views/objects.py          |  2 +-
 33 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/.github/workflows/github_action_build_docs.yml b/.github/workflows/github_action_build_docs.yml
index af2f249b0f..c3d0df5ec2 100644
--- a/.github/workflows/github_action_build_docs.yml
+++ b/.github/workflows/github_action_build_docs.yml
@@ -26,7 +26,7 @@ jobs:
         with:
             ref: v0.9.5
 
-      - name: Checkout develop branch 
+      - name: Checkout ${{ github.ref }} branch 
         uses: actions/checkout@v2
 
       - name: Set up Python ${{ matrix.python-version }}
@@ -56,6 +56,5 @@ jobs:
           git config --global user.email "docbuilder@evennia.com"
           git config --global user.name "Evennia docbuilder action"
           git branch
-          git checkout develop
           cd docs
           make release
diff --git a/docs/source/Contribs/Contrib-Building-Menu.md b/docs/source/Contribs/Contrib-Building-Menu.md
index e5c8d062aa..7a7318a160 100644
--- a/docs/source/Contribs/Contrib-Building-Menu.md
+++ b/docs/source/Contribs/Contrib-Building-Menu.md
@@ -26,7 +26,7 @@ that will edit any default object, offering to change its key and description.
         key = "DefaultCharacter"
 
         def at_cmdset_creation(self):
-            super(CharacterCmdSet, self).at_cmdset_creation()
+            super().at_cmdset_creation()
             # ... add the line below
             self.add(GenericBuildingCmd())
     ```
diff --git a/docs/source/Contribs/Contrib-Ingame-Python.md b/docs/source/Contribs/Contrib-Ingame-Python.md
index 2880b78055..4cb6a621b6 100644
--- a/docs/source/Contribs/Contrib-Ingame-Python.md
+++ b/docs/source/Contribs/Contrib-Ingame-Python.md
@@ -208,7 +208,7 @@ class CharacterCmdSet(default_cmds.CharacterCmdSet):
         """
         Populates the cmdset
         """
-        super(CharacterCmdSet, self).at_cmdset_creation()
+        super().at_cmdset_creation()
         self.add(CmdCallback())
 ```
 
diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py
index ca2b492c72..0edf186225 100644
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@@ -664,7 +664,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
             could get invalidated.
 
         """
-        super(DefaultAccount, self).set_password(password)
+        super().set_password(password)
         logger.log_sec(f"Password successfully changed for {self}.")
         self.at_password_change()
 
diff --git a/evennia/accounts/tests.py b/evennia/accounts/tests.py
index b975e03a56..6b0c87dbcf 100644
--- a/evennia/accounts/tests.py
+++ b/evennia/accounts/tests.py
@@ -116,7 +116,7 @@ class TestDefaultGuest(BaseEvenniaTest):
 
 class TestDefaultAccountAuth(BaseEvenniaTest):
     def setUp(self):
-        super(TestDefaultAccountAuth, self).setUp()
+        super().setUp()
 
         self.password = "testpassword"
         self.account.delete()
diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 0f64c86502..939d4d753f 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -141,7 +141,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
         """
         Support escaping of = with \=
         """
-        super(CmdNick, self).parse()
+        super().parse()
         args = (self.lhs or "") + (" = %s" % self.rhs if self.rhs else "")
         parts = re.split(r"(?<!\\)=", args, 1)
         self.rhs = None
diff --git a/evennia/contrib/base_systems/building_menu/README.md b/evennia/contrib/base_systems/building_menu/README.md
index 6efa0910bf..54ec657d82 100644
--- a/evennia/contrib/base_systems/building_menu/README.md
+++ b/evennia/contrib/base_systems/building_menu/README.md
@@ -26,7 +26,7 @@ that will edit any default object, offering to change its key and description.
         key = "DefaultCharacter"
 
         def at_cmdset_creation(self):
-            super(CharacterCmdSet, self).at_cmdset_creation()
+            super().at_cmdset_creation()
             # ... add the line below
             self.add(GenericBuildingCmd())
     ```
diff --git a/evennia/contrib/base_systems/building_menu/building_menu.py b/evennia/contrib/base_systems/building_menu/building_menu.py
index b906666fb0..83fe02f67d 100644
--- a/evennia/contrib/base_systems/building_menu/building_menu.py
+++ b/evennia/contrib/base_systems/building_menu/building_menu.py
@@ -26,7 +26,7 @@ that will edit any default object offering to change its key and description.
         key = "DefaultCharacter"
 
         def at_cmdset_creation(self):
-            super(CharacterCmdSet, self).at_cmdset_creation()
+            super().at_cmdset_creation()
             # ... add the line below
             self.add(GenericBuildingCmd())
     ```
@@ -338,7 +338,7 @@ class CmdNoInput(Command):
 
     def __init__(self, **kwargs):
         self.menu = kwargs.pop("building_menu", None)
-        super(Command, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def func(self):
         """Display the menu or choice text."""
@@ -359,7 +359,7 @@ class CmdNoMatch(Command):
 
     def __init__(self, **kwargs):
         self.menu = kwargs.pop("building_menu", None)
-        super(Command, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def func(self):
         """Call the proper menu or redirect to nomatch."""
diff --git a/evennia/contrib/base_systems/building_menu/tests.py b/evennia/contrib/base_systems/building_menu/tests.py
index 96d534908f..648f614f27 100644
--- a/evennia/contrib/base_systems/building_menu/tests.py
+++ b/evennia/contrib/base_systems/building_menu/tests.py
@@ -14,7 +14,7 @@ class Submenu(BuildingMenu):
 
 class TestBuildingMenu(BaseEvenniaCommandTest):
     def setUp(self):
-        super(TestBuildingMenu, self).setUp()
+        super().setUp()
         self.menu = BuildingMenu(caller=self.char1, obj=self.room1, title="test")
         self.menu.add_choice("title", key="t", attr="key")
 
diff --git a/evennia/contrib/base_systems/ingame_python/README.md b/evennia/contrib/base_systems/ingame_python/README.md
index 8f1961f93a..fbaef0a0d7 100644
--- a/evennia/contrib/base_systems/ingame_python/README.md
+++ b/evennia/contrib/base_systems/ingame_python/README.md
@@ -208,7 +208,7 @@ class CharacterCmdSet(default_cmds.CharacterCmdSet):
         """
         Populates the cmdset
         """
-        super(CharacterCmdSet, self).at_cmdset_creation()
+        super().at_cmdset_creation()
         self.add(CmdCallback())
 ```
 
diff --git a/evennia/contrib/game_systems/puzzles/puzzles.py b/evennia/contrib/game_systems/puzzles/puzzles.py
index 9e19ecf575..8297a618e6 100644
--- a/evennia/contrib/game_systems/puzzles/puzzles.py
+++ b/evennia/contrib/game_systems/puzzles/puzzles.py
@@ -808,7 +808,7 @@ class PuzzleSystemCmdSet(CmdSet):
     """
 
     def at_cmdset_creation(self):
-        super(PuzzleSystemCmdSet, self).at_cmdset_creation()
+        super().at_cmdset_creation()
 
         self.add(CmdCreatePuzzleRecipe())
         self.add(CmdEditPuzzle())
diff --git a/evennia/contrib/game_systems/puzzles/tests.py b/evennia/contrib/game_systems/puzzles/tests.py
index e6f26ff2dd..79d3fed228 100644
--- a/evennia/contrib/game_systems/puzzles/tests.py
+++ b/evennia/contrib/game_systems/puzzles/tests.py
@@ -16,7 +16,7 @@ from . import puzzles
 
 class TestPuzzles(BaseEvenniaCommandTest):
     def setUp(self):
-        super(TestPuzzles, self).setUp()
+        super().setUp()
         self.steel = create_object(self.object_typeclass, key="steel", location=self.char1.location)
         self.flint = create_object(self.object_typeclass, key="flint", location=self.char1.location)
         self.fire = create_object(self.object_typeclass, key="fire", location=self.char1.location)
diff --git a/evennia/contrib/game_systems/turnbattle/tb_items.py b/evennia/contrib/game_systems/turnbattle/tb_items.py
index 65ed24c8f5..d828c9bf0a 100644
--- a/evennia/contrib/game_systems/turnbattle/tb_items.py
+++ b/evennia/contrib/game_systems/turnbattle/tb_items.py
@@ -1046,7 +1046,7 @@ class CmdCombatHelp(CmdHelp):
                 + "|wUse:|n Use an item you're carrying."
             )
         else:
-            super(CmdCombatHelp, self).func()  # Call the default help command
+            super().func()  # Call the default help command
 
 
 class CmdUse(MuxCommand):
diff --git a/evennia/contrib/game_systems/turnbattle/tb_magic.py b/evennia/contrib/game_systems/turnbattle/tb_magic.py
index 81e882e3cf..e7b2766e59 100644
--- a/evennia/contrib/game_systems/turnbattle/tb_magic.py
+++ b/evennia/contrib/game_systems/turnbattle/tb_magic.py
@@ -1080,7 +1080,7 @@ class CmdCombatHelp(CmdHelp):
                 + "|wDisengage:|n End your turn and attempt to end combat.|/"
             )
         else:
-            super(CmdCombatHelp, self).func()  # Call the default help command
+            super().func()  # Call the default help command
 
 
 class BattleCmdSet(default_cmds.CharacterCmdSet):
diff --git a/evennia/contrib/game_systems/turnbattle/tb_range.py b/evennia/contrib/game_systems/turnbattle/tb_range.py
index b1575f53e4..f1c701ac10 100644
--- a/evennia/contrib/game_systems/turnbattle/tb_range.py
+++ b/evennia/contrib/game_systems/turnbattle/tb_range.py
@@ -1409,7 +1409,7 @@ class CmdCombatHelp(CmdHelp):
                 + "|wDisengage:|n End your turn and attempt to end combat.|/"
             )
         else:
-            super(CmdCombatHelp, self).func()  # Call the default help command
+            super().func()  # Call the default help command
 
 
 class BattleCmdSet(default_cmds.CharacterCmdSet):
diff --git a/evennia/contrib/game_systems/turnbattle/tests.py b/evennia/contrib/game_systems/turnbattle/tests.py
index 47bbfc847c..d342172f6d 100644
--- a/evennia/contrib/game_systems/turnbattle/tests.py
+++ b/evennia/contrib/game_systems/turnbattle/tests.py
@@ -24,7 +24,7 @@ class TestTurnBattleBasicCmd(BaseEvenniaCommandTest):
 
 class TestTurnBattleEquipCmd(BaseEvenniaCommandTest):
     def setUp(self):
-        super(TestTurnBattleEquipCmd, self).setUp()
+        super().setUp()
         self.testweapon = create_object(tb_equip.TBEWeapon, key="test weapon")
         self.testarmor = create_object(tb_equip.TBEArmor, key="test armor")
         self.testweapon.move_to(self.char1)
@@ -63,7 +63,7 @@ class TestTurnBattleRangeCmd(BaseEvenniaCommandTest):
 
 class TestTurnBattleItemsCmd(BaseEvenniaCommandTest):
     def setUp(self):
-        super(TestTurnBattleItemsCmd, self).setUp()
+        super().setUp()
         self.testitem = create_object(key="test item")
         self.testitem.move_to(self.char1)
 
@@ -95,7 +95,7 @@ class TestTurnBattleMagicCmd(BaseEvenniaCommandTest):
 
 class TestTurnBattleBasicFunc(BaseEvenniaTest):
     def setUp(self):
-        super(TestTurnBattleBasicFunc, self).setUp()
+        super().setUp()
         self.testroom = create_object(DefaultRoom, key="Test Room")
         self.attacker = create_object(
             tb_basic.TBBasicCharacter, key="Attacker", location=self.testroom
@@ -106,12 +106,12 @@ class TestTurnBattleBasicFunc(BaseEvenniaTest):
         self.joiner = create_object(tb_basic.TBBasicCharacter, key="Joiner", location=None)
 
     def tearDown(self):
-        super(TestTurnBattleBasicFunc, self).tearDown()
+        super().tearDown()
         self.turnhandler.stop()
-        self.testroom.delete()
         self.attacker.delete()
         self.defender.delete()
         self.joiner.delete()
+        self.testroom.delete()
 
     # Test combat functions
     def test_tbbasicfunc(self):
@@ -188,7 +188,7 @@ class TestTurnBattleBasicFunc(BaseEvenniaTest):
 
 class TestTurnBattleEquipFunc(BaseEvenniaTest):
     def setUp(self):
-        super(TestTurnBattleEquipFunc, self).setUp()
+        super().setUp()
         self.testroom = create_object(DefaultRoom, key="Test Room")
         self.attacker = create_object(
             tb_equip.TBEquipCharacter, key="Attacker", location=self.testroom
@@ -199,12 +199,12 @@ class TestTurnBattleEquipFunc(BaseEvenniaTest):
         self.joiner = create_object(tb_equip.TBEquipCharacter, key="Joiner", location=None)
 
     def tearDown(self):
-        super(TestTurnBattleEquipFunc, self).tearDown()
+        super().tearDown()
         self.turnhandler.stop()
-        self.testroom.delete()
         self.attacker.delete()
         self.defender.delete()
         self.joiner.delete()
+        self.testroom.delete()
 
     # Test the combat functions in tb_equip too. They work mostly the same.
     def test_tbequipfunc(self):
@@ -280,7 +280,7 @@ class TestTurnBattleEquipFunc(BaseEvenniaTest):
 
 class TestTurnBattleRangeFunc(BaseEvenniaTest):
     def setUp(self):
-        super(TestTurnBattleRangeFunc, self).setUp()
+        super().setUp()
         self.testroom = create_object(DefaultRoom, key="Test Room")
         self.attacker = create_object(
             tb_range.TBRangeCharacter, key="Attacker", location=self.testroom
@@ -291,12 +291,12 @@ class TestTurnBattleRangeFunc(BaseEvenniaTest):
         self.joiner = create_object(tb_range.TBRangeCharacter, key="Joiner", location=self.testroom)
 
     def tearDown(self):
-        super(TestTurnBattleRangeFunc, self).tearDown()
+        super().tearDown()
         self.turnhandler.stop()
-        self.testroom.delete()
         self.attacker.delete()
         self.defender.delete()
         self.joiner.delete()
+        self.testroom.delete()
 
     # Test combat functions in tb_range too.
     def test_tbrangefunc(self):
@@ -390,7 +390,7 @@ class TestTurnBattleRangeFunc(BaseEvenniaTest):
 class TestTurnBattleItemsFunc(BaseEvenniaTest):
     @patch("evennia.contrib.game_systems.turnbattle.tb_items.tickerhandler", new=MagicMock())
     def setUp(self):
-        super(TestTurnBattleItemsFunc, self).setUp()
+        super().setUp()
         self.testroom = create_object(DefaultRoom, key="Test Room")
         self.attacker = create_object(
             tb_items.TBItemsCharacter, key="Attacker", location=self.testroom
@@ -405,13 +405,13 @@ class TestTurnBattleItemsFunc(BaseEvenniaTest):
         self.test_healpotion.db.item_uses = 3
 
     def tearDown(self):
-        super(TestTurnBattleItemsFunc, self).tearDown()
+        super().tearDown()
         self.turnhandler.stop()
-        self.testroom.delete()
         self.attacker.delete()
         self.defender.delete()
         self.joiner.delete()
         self.user.delete()
+        self.testroom.delete()
 
     # Test functions in tb_items.
     def test_tbitemsfunc(self):
@@ -513,7 +513,7 @@ class TestTurnBattleItemsFunc(BaseEvenniaTest):
 
 class TestTurnBattleMagicFunc(BaseEvenniaTest):
     def setUp(self):
-        super(TestTurnBattleMagicFunc, self).setUp()
+        super().setUp()
         self.testroom = create_object(DefaultRoom, key="Test Room")
         self.attacker = create_object(
             tb_magic.TBMagicCharacter, key="Attacker", location=self.testroom
@@ -524,12 +524,12 @@ class TestTurnBattleMagicFunc(BaseEvenniaTest):
         self.joiner = create_object(tb_magic.TBMagicCharacter, key="Joiner", location=self.testroom)
 
     def tearDown(self):
-        super(TestTurnBattleMagicFunc, self).tearDown()
+        super().tearDown()
         self.turnhandler.stop()
-        self.testroom.delete()
         self.attacker.delete()
         self.defender.delete()
         self.joiner.delete()
+        self.testroom.delete()
 
     # Test combat functions in tb_magic.
     def test_tbbasicfunc(self):
diff --git a/evennia/contrib/grid/extended_room/extended_room.py b/evennia/contrib/grid/extended_room/extended_room.py
index 184ebf73d3..8c676d4b11 100644
--- a/evennia/contrib/grid/extended_room/extended_room.py
+++ b/evennia/contrib/grid/extended_room/extended_room.py
@@ -285,7 +285,7 @@ class ExtendedRoom(DefaultRoom):
         # ensures that our description is current based on time/season
         self.update_current_description()
         # run the normal return_appearance method, now that desc is updated.
-        return super(ExtendedRoom, self).return_appearance(looker, **kwargs)
+        return super().return_appearance(looker, **kwargs)
 
     def update_current_description(self):
         """
diff --git a/evennia/contrib/tutorials/bodyfunctions/tests.py b/evennia/contrib/tutorials/bodyfunctions/tests.py
index f91aec34aa..2848a8dfb0 100644
--- a/evennia/contrib/tutorials/bodyfunctions/tests.py
+++ b/evennia/contrib/tutorials/bodyfunctions/tests.py
@@ -12,11 +12,11 @@ class TestBodyFunctions(BaseEvenniaTest):
     script_typeclass = BodyFunctions
 
     def setUp(self):
-        super(TestBodyFunctions, self).setUp()
+        super().setUp()
         self.script.obj = self.char1
 
     def tearDown(self):
-        super(TestBodyFunctions, self).tearDown()
+        super().tearDown()
         # if we forget to stop the script, DirtyReactorAggregateError will be raised
         self.script.stop()
 
diff --git a/evennia/contrib/utils/auditing/server.py b/evennia/contrib/utils/auditing/server.py
index f828320705..a868f21c2c 100644
--- a/evennia/contrib/utils/auditing/server.py
+++ b/evennia/contrib/utils/auditing/server.py
@@ -228,7 +228,7 @@ class AuditedServerSession(ServerSession):
             except Exception as e:
                 logger.log_err(e)
 
-        super(AuditedServerSession, self).data_out(**kwargs)
+        super().data_out(**kwargs)
 
     def data_in(self, **kwargs):
         """
@@ -246,4 +246,4 @@ class AuditedServerSession(ServerSession):
             except Exception as e:
                 logger.log_err(e)
 
-        super(AuditedServerSession, self).data_in(**kwargs)
+        super().data_in(**kwargs)
diff --git a/evennia/locks/tests.py b/evennia/locks/tests.py
index 4d65c6a586..1ab20b9dd6 100644
--- a/evennia/locks/tests.py
+++ b/evennia/locks/tests.py
@@ -44,7 +44,7 @@ class TestLockCheck(BaseEvenniaTest):
 
 class TestLockfuncs(BaseEvenniaTest):
     def setUp(self):
-        super(TestLockfuncs, self).setUp()
+        super().setUp()
         self.account2.permissions.add("Admin")
         self.char2.permissions.add("Builder")
 
diff --git a/evennia/prototypes/menus.py b/evennia/prototypes/menus.py
index 4dbac61063..2858c31123 100644
--- a/evennia/prototypes/menus.py
+++ b/evennia/prototypes/menus.py
@@ -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)
diff --git a/evennia/prototypes/tests.py b/evennia/prototypes/tests.py
index 34d042edf9..f3a05aa831 100644
--- a/evennia/prototypes/tests.py
+++ b/evennia/prototypes/tests.py
@@ -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
diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index c6ef5ec5cc..beef408584 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -108,7 +108,7 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
         """
         # print("AMPClient new connection {}".format(self))
         info_dict = self.factory.server.get_info_dict()
-        super(AMPServerClientProtocol, self).connectionMade()
+        super().connectionMade()
         # first thing we do is to request the Portal to sync all sessions
         # back with the Server side. We also need the startup mode (reload, reset, shutdown)
         self.send_AdminServer2Portal(
diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py
index c75db6c8eb..574fcd2313 100644
--- a/evennia/server/portal/amp.py
+++ b/evennia/server/portal/amp.py
@@ -177,14 +177,14 @@ class Compressed(amp.String):
         Note: In Py3 this is really a byte stream.
 
         """
-        return zlib.compress(super(Compressed, self).toString(inObject), 9)
+        return zlib.compress(super().toString(inObject), 9)
 
     def fromString(self, inString):
         """
         Convert (decompress) from the string-representation on the wire to Python.
 
         """
-        return super(Compressed, self).fromString(zlib.decompress(inString))
+        return super().fromString(zlib.decompress(inString))
 
 
 class MsgLauncher2Portal(amp.Command):
@@ -313,7 +313,7 @@ class AMPMultiConnectionProtocol(amp.AMP):
         self.send_task = None
         self.multibatches = 0
         # later twisted amp has its own __init__
-        super(AMPMultiConnectionProtocol, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def _commandReceived(self, box):
         """
@@ -368,7 +368,7 @@ class AMPMultiConnectionProtocol(amp.AMP):
                 # an incomplete AMP box means more batches are forthcoming.
                 self.multibatches += 1
             try:
-                super(AMPMultiConnectionProtocol, self).dataReceived(data)
+                super().dataReceived(data)
             except KeyError:
                 _get_logger().log_trace(
                     "Discarded incoming partial (packed) data (len {})".format(len(data))
@@ -379,7 +379,7 @@ class AMPMultiConnectionProtocol(amp.AMP):
                 # end of existing multibatch
                 self.multibatches = max(0, self.multibatches - 1)
             try:
-                super(AMPMultiConnectionProtocol, self).dataReceived(data)
+                super().dataReceived(data)
             except KeyError:
                 _get_logger().log_trace(
                     "Discarded incoming multi-batch (packed) data (len {})".format(len(data))
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 0f53dbf259..092281e65e 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -95,7 +95,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
         """
         # wipe broadcast and data memory
-        super(AMPServerProtocol, self).connectionLost(reason)
+        super().connectionLost(reason)
         if self.factory.server_connection == self:
             self.factory.server_connection = None
             self.factory.portal.server_info_dict = {}
diff --git a/evennia/server/portal/telnet_ssl.py b/evennia/server/portal/telnet_ssl.py
index 09b299e239..508c89cce8 100644
--- a/evennia/server/portal/telnet_ssl.py
+++ b/evennia/server/portal/telnet_ssl.py
@@ -72,7 +72,7 @@ class SSLProtocol(TelnetProtocol):
     """
 
     def __init__(self, *args, **kwargs):
-        super(SSLProtocol, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.protocol_key = "telnet/ssl"
 
 
diff --git a/evennia/server/portal/tests.py b/evennia/server/portal/tests.py
index ead4bf4fe5..81ea10432d 100644
--- a/evennia/server/portal/tests.py
+++ b/evennia/server/portal/tests.py
@@ -46,7 +46,7 @@ class TestAMPServer(TwistedTestCase):
     """
 
     def setUp(self):
-        super(TestAMPServer, self).setUp()
+        super().setUp()
         portal = Mock()
         factory = AMPServerFactory(portal)
         self.proto = factory.buildProtocol(("localhost", 0))
@@ -217,7 +217,7 @@ class TestIRC(TestCase):
 
 class TestTelnet(TwistedTestCase):
     def setUp(self):
-        super(TestTelnet, self).setUp()
+        super().setUp()
         factory = TelnetServerFactory()
         factory.protocol = TelnetProtocol
         factory.sessionhandler = PORTAL_SESSIONS
diff --git a/evennia/server/serversession.py b/evennia/server/serversession.py
index ec9cd5eaaa..f7309af59b 100644
--- a/evennia/server/serversession.py
+++ b/evennia/server/serversession.py
@@ -76,7 +76,7 @@ class ServerSession(_BASE_SESSION_CLASS):
         if not _ObjectDB:
             from evennia.objects.models import ObjectDB as _ObjectDB
 
-        super(ServerSession, self).at_sync()
+        super().at_sync()
         if not self.logged_in:
             # assign the unloggedin-command set.
             self.cmdset_storage = settings.CMDSET_UNLOGGEDIN
diff --git a/evennia/server/tests/test_amp_connection.py b/evennia/server/tests/test_amp_connection.py
index 2c09eb48aa..74da47dfdd 100644
--- a/evennia/server/tests/test_amp_connection.py
+++ b/evennia/server/tests/test_amp_connection.py
@@ -24,7 +24,7 @@ DelayedCall.debug = True
 #        MagicMock(return_value=create.account("TestAMPAccount", "test@test.com", "testpassword")))
 class _TestAMP(TwistedTestCase):
     def setUp(self):
-        super(_TestAMP, self).setUp()
+        super().setUp()
         self.account = mommy.make("accounts.AccountDB", id=1)
         self.server = server.Evennia(MagicMock())
         self.server.sessions.data_in = MagicMock()
@@ -47,7 +47,7 @@ class _TestAMP(TwistedTestCase):
 
     def tearDown(self):
         self.account.delete()
-        super(_TestAMP, self).tearDown()
+        super().tearDown()
 
     def _connect_client(self, mocktransport):
         "Setup client to send data for testing"
diff --git a/evennia/server/tests/testrunner.py b/evennia/server/tests/testrunner.py
index cf940eaa22..5eaa1daa31 100644
--- a/evennia/server/tests/testrunner.py
+++ b/evennia/server/tests/testrunner.py
@@ -32,6 +32,6 @@ class EvenniaTestSuiteRunner(DiscoverRunner):
         import evennia
 
         evennia._init()
-        return super(EvenniaTestSuiteRunner, self).build_suite(
+        return super().build_suite(
             test_labels, extra_tests=extra_tests, **kwargs
         )
diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index dc4060ff17..1136c52762 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -751,7 +751,7 @@ class TypeclassManager(TypedObjectManager):
             Annotated queryset.
         """
         return (
-            super(TypeclassManager, self)
+            super()
             .filter(db_typeclass_path=self.model.path)
             .annotate(*args, **kwargs)
         )
@@ -767,7 +767,7 @@ class TypeclassManager(TypedObjectManager):
             Queryset of values dictionaries, just filtered by typeclass first.
         """
         return (
-            super(TypeclassManager, self)
+            super()
             .filter(db_typeclass_path=self.model.path)
             .values(*args, **kwargs)
         )
@@ -783,7 +783,7 @@ class TypeclassManager(TypedObjectManager):
             Queryset of value_list tuples, just filtered by typeclass first.
         """
         return (
-            super(TypeclassManager, self)
+            super()
             .filter(db_typeclass_path=self.model.path)
             .values_list(*args, **kwargs)
         )
diff --git a/evennia/web/website/tests.py b/evennia/web/website/tests.py
index 4b6218627e..e8b9dcf21d 100644
--- a/evennia/web/website/tests.py
+++ b/evennia/web/website/tests.py
@@ -31,7 +31,7 @@ class EvenniaWebTest(BaseEvenniaTest):
     authenticated_response = 200
 
     def setUp(self):
-        super(EvenniaWebTest, self).setUp()
+        super().setUp()
 
         # Add chars to account rosters
         self.account.db._playable_characters = [self.char1]
@@ -110,13 +110,13 @@ class WebclientTest(EvenniaWebTest):
     def test_get(self):
         self.authenticated_response = 200
         self.unauthenticated_response = 200
-        super(WebclientTest, self).test_get()
+        super().test_get()
 
     @override_settings(WEBCLIENT_ENABLED=False)
     def test_get_disabled(self):
         self.authenticated_response = 404
         self.unauthenticated_response = 404
-        super(WebclientTest, self).test_get()
+        super().test_get()
 
 
 class ChannelListTest(EvenniaWebTest):
@@ -127,7 +127,7 @@ class ChannelDetailTest(EvenniaWebTest):
     url_name = "channel-detail"
 
     def setUp(self):
-        super(ChannelDetailTest, self).setUp()
+        super().setUp()
 
         klass = class_from_module(self.channel_typeclass,
                                   fallback=settings.FALLBACK_CHANNEL_TYPECLASS)
@@ -189,7 +189,7 @@ class HelpLockedDetailTest(EvenniaWebTest):
     url_name = "help-entry-detail"
 
     def setUp(self):
-        super(HelpLockedDetailTest, self).setUp()
+        super().setUp()
 
         # create a db entry with a lock
         self.db_help_entry = create_help_entry('unit test locked topic', 'unit test locked entrytext',
diff --git a/evennia/web/website/views/objects.py b/evennia/web/website/views/objects.py
index 3520440a6d..dcbd46504d 100644
--- a/evennia/web/website/views/objects.py
+++ b/evennia/web/website/views/objects.py
@@ -123,7 +123,7 @@ class ObjectDetailView(EvenniaDetailView):
             raise PermissionDenied("You are not authorized to %s this object." % self.access_type)
 
         # Get the object, if it is in the specified queryset
-        obj = super(ObjectDetailView, self).get_object(queryset)
+        obj = super().get_object(queryset)
 
         return obj