From 4a97a05c10e04a417f16b0304b06666ea178ce20 Mon Sep 17 00:00:00 2001 From: Griatch Date: Wed, 14 Sep 2016 23:27:55 +0200 Subject: [PATCH] Some minor fixes and cleanups. --- evennia/server/portal/portalsessionhandler.py | 2 +- evennia/server/portal/webclient.py | 3 +-- evennia/web/utils/backends.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/evennia/server/portal/portalsessionhandler.py b/evennia/server/portal/portalsessionhandler.py index c987f45d0..e42363576 100644 --- a/evennia/server/portal/portalsessionhandler.py +++ b/evennia/server/portal/portalsessionhandler.py @@ -320,7 +320,7 @@ class PortalSessionHandler(SessionHandler): """ return [sess for sess in self.get_sessions(include_unloggedin=True) - if hasattr(sess, 'csessid') and sess.csessid == csessid] + if hasattr(sess, 'csessid') and sess.csessid and sess.csessid == csessid] def announce_all(self, message): """ diff --git a/evennia/server/portal/webclient.py b/evennia/server/portal/webclient.py index d351aaea5..7b47e95e8 100644 --- a/evennia/server/portal/webclient.py +++ b/evennia/server/portal/webclient.py @@ -93,7 +93,6 @@ class WebSocketClient(Protocol, Session): self.sessionhandler.disconnect(self) self.transport.close() - def dataReceived(self, string): """ Method called when data is coming in over the websocket @@ -128,7 +127,7 @@ class WebSocketClient(Protocol, Session): Notes: At initilization, the client will send the special 'csessid' command to identify its browser session hash - with the Evennia side. + witherthe Evennia side. The websocket client will also pass 'websocket_close' command to report that the client has been closed and that the diff --git a/evennia/web/utils/backends.py b/evennia/web/utils/backends.py index 5794dbd2d..e99128a42 100644 --- a/evennia/web/utils/backends.py +++ b/evennia/web/utils/backends.py @@ -28,7 +28,7 @@ class CaseInsensitiveModelBackend(ModelBackend): return autologin else: # In this case .backend will be assigned automatically - # somewhere along the # way. + # somewhere along the way. Player = get_user_model() try: player = Player.objects.get(username__iexact=username)