diff --git a/apps/objects/managers/attribute.py b/apps/objects/managers/attribute.py index a78670154..0bf6f3e3d 100644 --- a/apps/objects/managers/attribute.py +++ b/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): diff --git a/apps/objects/managers/object.py b/apps/objects/managers/object.py index 04668429b..83e7c15bb 100644 --- a/apps/objects/managers/object.py +++ b/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): diff --git a/apps/objects/models.py b/apps/objects/models.py index 92aeb45b4..4133f013a 100755 --- a/apps/objects/models.py +++ b/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 diff --git a/src/commands/comsys.py b/src/commands/comsys.py index c9fbaecc6..d84c1281a 100644 --- a/src/commands/comsys.py +++ b/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): diff --git a/src/commands/general.py b/src/commands/general.py index 75b608d58..c1594baed 100644 --- a/src/commands/general.py +++ b/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 diff --git a/src/commands/info.py b/src/commands/info.py index d1914025f..7f28ad151 100644 --- a/src/commands/info.py +++ b/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): """ diff --git a/src/commands/privileged.py b/src/commands/privileged.py index a8aa4b66e..7bd1a58c3 100644 --- a/src/commands/privileged.py +++ b/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): """ diff --git a/src/commands/unloggedin.py b/src/commands/unloggedin.py index 2e60e1b19..6f7d65c4d 100644 --- a/src/commands/unloggedin.py +++ b/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): """ diff --git a/defines_global.py b/src/defines_global.py similarity index 100% rename from defines_global.py rename to src/defines_global.py