From 798272f985faba72c3195ef3cf220824aba97194 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 26 Feb 2023 14:44:28 +0100 Subject: [PATCH] Homogenize return from ServerSession.get_puppet/account. Resolve #3100 --- evennia/server/serversession.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/evennia/server/serversession.py b/evennia/server/serversession.py index 917f591e18..9eeb186a26 100644 --- a/evennia/server/serversession.py +++ b/evennia/server/serversession.py @@ -10,15 +10,10 @@ import time from django.conf import settings from django.utils import timezone - from evennia.commands.cmdsethandler import CmdSetHandler from evennia.comms.models import ChannelDB from evennia.scripts.monitorhandler import MONITOR_HANDLER -from evennia.typeclasses.attributes import ( - AttributeHandler, - DbHolder, - InMemoryAttributeBackend, -) +from evennia.typeclasses.attributes import AttributeHandler, DbHolder, InMemoryAttributeBackend from evennia.utils import logger from evennia.utils.utils import class_from_module, lazy_property, make_iter @@ -155,20 +150,20 @@ class ServerSession(_BASE_SESSION_CLASS): Get the account associated with this session Returns: - account (Account): The associated Account. + account (Account or None): The associated Account. """ - return self.logged_in and self.account + return self.account if self.logged_in else None def get_puppet(self): """ Get the in-game character associated with this session. Returns: - puppet (Object): The puppeted object, if any. + puppet (Object or None): The puppeted object, if any. """ - return self.logged_in and self.puppet + return self.puppet if self.logged_in else None get_character = get_puppet