Even more death and destruction. A lot more stuff moved to src/. A lot more bugs probably introduced.

apps/objects/models.py

@@ -3,15 +3,16 @@ import re
 from django.db import models
 from django.contrib.auth.models import User, Group
 
-import scripthandler
-import defines_global
-import ansi
-import src.flags
 from apps.config.models import ConfigValue
 from apps.objects.util import object as util_object
 from apps.objects.managers.commchannel import CommChannelManager
 from apps.objects.managers.object import ObjectManager
 from apps.objects.managers.attribute import AttributeManager
+from src import scripthandler
+import defines_global
+from src import ansi
+# Import as the absolute path to avoid local variable clashes.
+import src.flags
 
 class Attribute(models.Model):
     """
@@ -894,4 +895,4 @@ class CommChannelMessage(models.Model):
         list_display = ('channel', 'message')
 
 import functions_general
-import session_mgr
+from src import session_mgr