Finished moving stuff around, things should be in mostly working order now.

src/commands/comsys.py

@@ -6,10 +6,10 @@ import time
 
 from django.conf import settings
 
-import functions_general
 import src.comsys
 from src import defines_global
 from src import ansi
+from src.util import functions_general
 
 def cmd_addcom(cdat):
     """

src/commands/general.py

@@ -9,10 +9,10 @@ from django.conf import settings
 from apps.config.models import ConfigValue
 from apps.helpsys.models import HelpEntry
 from apps.objects.models import Object
-import functions_general
 from src import defines_global
 from src import session_mgr
 from src import ansi
+from src.util import functions_general
 
 def cmd_password(cdat):
     """
@@ -71,7 +71,7 @@ def cmd_wall(cdat):
         return
         
     message = "%s shouts \"%s\"" % (session.get_pobject().get_name(show_dbref=False), wallstring)
-    functions_general.announce_all(message)
+    session_mgr.announce_all(message)
 
 def cmd_idle(cdat):
     """

src/commands/info.py

@@ -5,7 +5,7 @@ the server instance.
 import os
 import time
 
-import functions_general
+from src.util import functions_general
 
 if not functions_general.host_os_is('nt'):
     # Don't import the resource module if the host OS is Windows.

src/commands/privileged.py

@@ -4,8 +4,8 @@ are generally @-prefixed commands, but there are exceptions.
 """
 from apps.objects.models import Object
 from src import defines_global
-import functions_general
 from src import ansi
+from src.util import functions_general
 
 def cmd_reload(cdat):
     """

src/commands/unloggedin.py

@@ -4,8 +4,8 @@ Commands that are available from the connect screen.
 from django.contrib.auth.models import User
 
 from apps.objects.models import Attribute, Object
-import functions_general
 from src import defines_global
+from src.util import functions_general
 
 def cmd_connect(cdat):
     """