Use Python 3's new super() convention.

evennia/utils/idmapper/manager.py

@@ -33,5 +33,5 @@ class SharedMemoryManager(Manager):
                 except Exception:
                     pass
         if inst is None:
-            inst = super(SharedMemoryManager, self).get(*args, **kwargs)
+            inst = super().get(*args, **kwargs)
         return inst

evennia/utils/idmapper/models.py

@@ -85,7 +85,7 @@ class SharedMemoryModelBase(ModelBase):
         if not hasattr(dbmodel, "__instance_cache__"):
             # we store __instance_cache__ only on the dbmodel base
             dbmodel.__instance_cache__ = {}
-        super(SharedMemoryModelBase, cls)._prepare()
+        super()._prepare()
 
     def __new__(cls, name, bases, attrs):
         """
@@ -203,7 +203,7 @@ class SharedMemoryModelBase(ModelBase):
                 # makes sure not to overload manually created wrappers on the model
                 create_wrapper(cls, fieldname, wrappername, editable=field.editable, foreignkey=foreignkey)
 
-        return super(SharedMemoryModelBase, cls).__new__(cls, name, bases, attrs)
+        return super().__new__(cls, name, bases, attrs)
 
 
 class SharedMemoryModel(with_metaclass(SharedMemoryModelBase, Model)):
@@ -364,7 +364,7 @@ class SharedMemoryModel(with_metaclass(SharedMemoryModelBase, Model)):
         """
         self.flush_from_cache()
         self._is_deleted = True
-        super(SharedMemoryModel, self).delete(*args, **kwargs)
+        super().delete(*args, **kwargs)
 
     def save(self, *args, **kwargs):
         """
@@ -390,11 +390,11 @@ class SharedMemoryModel(with_metaclass(SharedMemoryModelBase, Model)):
 
         if _IS_MAIN_THREAD:
             # in main thread - normal operation
-            super(SharedMemoryModel, self).save(*args, **kwargs)
+            super().save(*args, **kwargs)
         else:
             # in another thread; make sure to save in reactor thread
             def _save_callback(cls, *args, **kwargs):
-                super(SharedMemoryModel, cls).save(*args, **kwargs)
+                super().save(*args, **kwargs)
             callFromThread(_save_callback, self, *args, **kwargs)
 
         # update field-update hooks and eventual OOB watchers
@@ -429,7 +429,7 @@ class WeakSharedMemoryModelBase(SharedMemoryModelBase):
 
     """
     def _prepare(cls):
-        super(WeakSharedMemoryModelBase, cls)._prepare()
+        super()._prepare()
         cls.__dbclass__.__instance_cache__ = WeakValueDictionary()
 
 

evennia/utils/idmapper/tests.py

@@ -31,7 +31,7 @@ class SharedMemorysTest(TestCase):
     # TODO: test for cross model relation (singleton to regular)
 
     def setUp(self):
-        super(SharedMemorysTest, self).setUp()
+        super().setUp()
         n = 0
         category = Category.objects.create(name="Category %d" % (n,))
         regcategory = RegularCategory.objects.create(name="Category %d" % (n,))