Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Python 3's new super() convention.

Browse source
This commit is contained in:
Ryan Stein 2017-11-02 10:41:41 -04:00
parent 0cd979327b
commit cd21fb2396
52 changed files with 164 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

12
evennia/utils/idmapper/models.py
View file

@ -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()