From a09835049b3a785c59fb25f1031a260d96151823 Mon Sep 17 00:00:00 2001 From: Griatch Date: Thu, 26 Jan 2017 21:35:13 +0100 Subject: [PATCH] Refactor wrong super() parents in a few managers. --- evennia/objects/objects.py | 2 +- evennia/players/players.py | 2 +- evennia/server/portal/ssl.py | 2 +- evennia/typeclasses/managers.py | 18 +++++++++--------- evennia/utils/eveditor.py | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index 70497dd70..c7121e8b8 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -864,7 +864,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)): self.location = None # this updates contents_cache for our location # Perform the deletion of the object - super(ObjectDB, self).delete() + super(DefaultObject, self).delete() return True def access(self, accessing_obj, access_type='read', default=False, no_superuser_bypass=False, **kwargs): diff --git a/evennia/players/players.py b/evennia/players/players.py index 640e24af7..e9947e577 100644 --- a/evennia/players/players.py +++ b/evennia/players/players.py @@ -382,7 +382,7 @@ class DefaultPlayer(with_metaclass(TypeclassBase, PlayerDB)): self.attributes.clear() self.nicks.clear() self.aliases.clear() - super(PlayerDB, self).delete(*args, **kwargs) + super(DefaultPlayer, self).delete(*args, **kwargs) ## methods inherited from database model def msg(self, text=None, from_obj=None, session=None, options=None, **kwargs): diff --git a/evennia/server/portal/ssl.py b/evennia/server/portal/ssl.py index bc81e8ce9..99f4de166 100644 --- a/evennia/server/portal/ssl.py +++ b/evennia/server/portal/ssl.py @@ -51,7 +51,7 @@ class SSLProtocol(TelnetProtocol): is done with encryption. """ def __init__(self, *args, **kwargs): - super(TelnetProtocol, self).__init__(*args, **kwargs) + super(SSLProtocol, self).__init__(*args, **kwargs) self.protocol_name = "ssl" def verify_SSL_key_and_cert(keyfile, certfile): diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py index 9347e9fb4..b6c486b16 100644 --- a/evennia/typeclasses/managers.py +++ b/evennia/typeclasses/managers.py @@ -535,7 +535,7 @@ class TypeclassManager(TypedObjectManager): """ kwargs.update({"db_typeclass_path":self.model.path}) - return super(TypedObjectManager, self).get(**kwargs) + return super(TypeclassManager, self).get(**kwargs) def filter(self, *args, **kwargs): """ @@ -553,7 +553,7 @@ class TypeclassManager(TypedObjectManager): """ kwargs.update({"db_typeclass_path":self.model.path}) - return super(TypedObjectManager, self).filter(*args, **kwargs) + return super(TypeclassManager, self).filter(*args, **kwargs) def all(self): """ @@ -563,7 +563,7 @@ class TypeclassManager(TypedObjectManager): objects (queryset): The objects found. """ - return super(TypedObjectManager, self).all().filter(db_typeclass_path=self.model.path) + return super(TypeclassManager, self).all().filter(db_typeclass_path=self.model.path) def first(self): """ @@ -577,7 +577,7 @@ class TypeclassManager(TypedObjectManager): on the model base used. """ - return super(TypedObjectManager, self).filter(db_typeclass_path=self.model.path).first() + return super(TypeclassManager, self).filter(db_typeclass_path=self.model.path).first() def last(self): """ @@ -591,7 +591,7 @@ class TypeclassManager(TypedObjectManager): on the model base used. """ - return super(TypedObjectManager, self).filter(db_typeclass_path=self.model.path).last() + return super(TypeclassManager, self).filter(db_typeclass_path=self.model.path).last() def count(self): """ @@ -601,7 +601,7 @@ class TypeclassManager(TypedObjectManager): integer : Number of objects found. """ - return super(TypedObjectManager, self).filter(db_typeclass_path=self.model.path).count() + return super(TypeclassManager, self).filter(db_typeclass_path=self.model.path).count() def _get_subclasses(self, cls): """ @@ -634,7 +634,7 @@ class TypeclassManager(TypedObjectManager): paths = [self.model.path] + ["%s.%s" % (cls.__module__, cls.__name__) for cls in self._get_subclasses(self.model)] kwargs.update({"db_typeclass_path__in":paths}) - return super(TypedObjectManager, self).get(**kwargs) + return super(TypeclassManager, self).get(**kwargs) def filter_family(self, *args, **kwargs): """ @@ -655,7 +655,7 @@ class TypeclassManager(TypedObjectManager): paths = [self.model.path] + ["%s.%s" % (cls.__module__, cls.__name__) for cls in self._get_subclasses(self.model)] kwargs.update({"db_typeclass_path__in":paths}) - return super(TypedObjectManager, self).filter(*args, **kwargs) + return super(TypeclassManager, self).filter(*args, **kwargs) def all_family(self): """ @@ -668,6 +668,6 @@ class TypeclassManager(TypedObjectManager): """ paths = [self.model.path] + ["%s.%s" % (cls.__module__, cls.__name__) for cls in self._get_subclasses(self.model)] - return super(TypedObjectManager, self).all().filter(db_typeclass_path__in=paths) + return super(TypeclassManager, self).all().filter(db_typeclass_path__in=paths) diff --git a/evennia/utils/eveditor.py b/evennia/utils/eveditor.py index f56756d41..9bd553796 100644 --- a/evennia/utils/eveditor.py +++ b/evennia/utils/eveditor.py @@ -653,7 +653,7 @@ class EvEditor(object): if savefunc: self._savefunc = savefunc else: - self._savefunc = lambda caller: caller.msg(_ERROR_NO_SAVEFUNC) + self._savefunc = lambda caller, buffer: caller.msg(_ERROR_NO_SAVEFUNC) if quitfunc: self._quitfunc = quitfunc else: