Moved defines_globals to src/

apps/objects/managers/attribute.py

@@ -3,7 +3,7 @@ Custom manager for Attribute objects.
 """
 from django.db import models
 
-import defines_global
+from src import defines_global
 
 class AttributeManager(models.Manager):
     def is_modifiable_attrib(self, attribname):

apps/objects/managers/object.py

@@ -13,7 +13,7 @@ from django.contrib.contenttypes.models import ContentType
 from apps.config.models import ConfigValue
 from apps.objects.exceptions import ObjectNotExist
 from apps.objects.util import object as util_object
-import defines_global
+from src import defines_global
 
 class ObjectManager(models.Manager):
     def num_total_players(self):

apps/objects/models.py

@@ -9,7 +9,7 @@ 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 defines_global
 from src import ansi
 # Import as the absolute path to avoid local variable clashes.
 import src.flags

src/commands/comsys.py

@@ -8,7 +8,7 @@ from django.conf import settings
 
 import functions_general
 import src.comsys
-import defines_global
+from src import defines_global
 from src import ansi
 
 def cmd_addcom(cdat):

src/commands/general.py

@@ -10,7 +10,7 @@ from apps.config.models import ConfigValue
 from apps.helpsys.models import HelpEntry
 from apps.objects.models import Object
 import functions_general
-import defines_global
+from src import defines_global
 from src import session_mgr
 from src import ansi
 

src/commands/info.py

@@ -15,7 +15,7 @@ import django
 
 from apps.objects.models import Object
 from src import scheduler
-import defines_global
+from src import defines_global
 
 def cmd_version(cdat):
     """

src/commands/privileged.py

@@ -1,12 +1,11 @@
-from apps.objects.models import Object
-import defines_global
-import functions_general
-from src import ansi
-
 """
 This file contains commands that require special permissions to use. These
 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
 
 def cmd_reload(cdat):
     """

src/commands/unloggedin.py

@@ -5,7 +5,7 @@ from django.contrib.auth.models import User
 
 from apps.objects.models import Attribute, Object
 import functions_general
-import defines_global
+from src import defines_global
 
 def cmd_connect(cdat):
     """