Merge pull request #3187 from volundmush/fix_circular_imports

Changed importing of SESSION_HANDLER to avoid circular imports when e…

evennia/contrib/base_systems/godotwebsocket/webclient.py

@@ -12,7 +12,6 @@ from twisted.application import internet
 from evennia import settings
 from evennia.contrib.base_systems.godotwebsocket.text2bbcode import parse_to_bbcode
 from evennia.server.portal import webclient
-from evennia.server.portal.portalsessionhandler import PORTAL_SESSIONS
 from evennia.settings_default import LOCKDOWN_MODE
 
 
@@ -70,6 +69,7 @@ def start_plugin_services(portal):
     factory = GodotWebsocket()
     factory.noisy = False
     factory.protocol = GodotWebSocketClient
+    from evennia.server.portal.portalsessionhandler import PORTAL_SESSIONS
     factory.sessionhandler = PORTAL_SESSIONS
 
     interface = "127.0.0.1" if LOCKDOWN_MODE else settings.GODOT_CLIENT_WEBSOCKET_CLIENT_INTERFACE

evennia/contrib/utils/auditing/tests.py

@@ -9,7 +9,7 @@ from anything import Anything
 from django.test import override_settings
 from mock import patch
 
-from evennia.server.sessionhandler import SESSIONS
+import evennia
 from evennia.utils.test_resources import BaseEvenniaTest
 
 from .server import AuditedServerSession
@@ -21,13 +21,13 @@ class AuditingTest(BaseEvenniaTest):
     def setup_session(self):
         """Overrides default one in EvenniaTest"""
         dummysession = AuditedServerSession()
-        dummysession.init_session("telnet", ("localhost", "testmode"), SESSIONS)
+        dummysession.init_session("telnet", ("localhost", "testmode"), evennia.SESSION_HANDLER)
         dummysession.sessid = 1
-        SESSIONS.portal_connect(
+        evennia.SESSION_HANDLER.portal_connect(
             dummysession.get_sync_data()
         )  # note that this creates a new Session!
-        session = SESSIONS.session_from_sessid(1)  # the real session
-        SESSIONS.login(session, self.account, testmode=True)
+        session = evennia.SESSION_HANDLER.session_from_sessid(1)  # the real session
+        evennia.SESSION_HANDLER.login(session, self.account, testmode=True)
         self.session = session
 
     @patch(

evennia/contrib/utils/fieldfill/fieldfill.py

@@ -138,9 +138,8 @@ Optional:
         object dbrefs). For boolean fields, return '0' or '1' to set
         the field to False or True.
 """
-
+import evennia
 from evennia import Command
-from evennia.server.sessionhandler import SESSIONS
 from evennia.utils import delay, evmenu, evtable, list_to_string, logger
 
 
@@ -573,7 +572,7 @@ def verify_online_player(caller, value):
             made.
     """
     # Get a list of sessions
-    session_list = SESSIONS.get_sessions()
+    session_list = evennia.SESSION_HANDLER.get_sessions()
     char_list = []
     matched_character = None
 

evennia/contrib/utils/git_integration/git_integration.py

@@ -3,9 +3,9 @@ import datetime
 import git
 from django.conf import settings
 
+import evennia
 from evennia import CmdSet, InterruptCommand
 from evennia.commands.default.muxcommand import MuxCommand
-from evennia.server.sessionhandler import SESSIONS
 from evennia.utils.utils import list_to_string
 
 
@@ -147,10 +147,10 @@ class GitCommand(MuxCommand):
             caller.msg(self.get_branches())
         elif self.action == "checkout":
             if self.checkout():
-                SESSIONS.portal_restart_server()
+                evennia.SESSION_HANDLER.portal_restart_server()
         elif self.action == "pull":
             if self.pull():
-                SESSIONS.portal_restart_server()
+                evennia.SESSION_HANDLER.portal_restart_server()
         else:
             caller.msg("You can only git status, git branch, git checkout, or git pull.")
             return