From 54756bf5e2d1ca82ebd485239d167d443b6303cd Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Wed, 6 Jun 2012 14:16:28 -0400 Subject: [PATCH] Use relative includes in settings files --- lms/envs/aws.py | 4 ++-- lms/envs/content.py | 2 +- lms/envs/dev_ike.py | 6 +++--- lms/envs/devplus.py | 2 +- lms/envs/static.py | 4 ++-- lms/envs/test.py | 4 ++-- lms/envs/test_ike.py | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 7363cbb3f7..c61396d5fd 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -8,8 +8,8 @@ Common traits: """ import json -from envs.logsettings import get_logger_config -from envs.common import * +from .logsettings import get_logger_config +from .common import * ############################### ALWAYS THE SAME ################################ DEBUG = False diff --git a/lms/envs/content.py b/lms/envs/content.py index 495bbeedac..2584dca969 100644 --- a/lms/envs/content.py +++ b/lms/envs/content.py @@ -2,7 +2,7 @@ These are debug machines used for content creators, so they're kind of a cross between dev machines and AWS machines. """ -from envs.aws import * +from .aws import * DEBUG = True TEMPLATE_DEBUG = True diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py index dd6ffa9176..ee5b6e831b 100644 --- a/lms/envs/dev_ike.py +++ b/lms/envs/dev_ike.py @@ -13,9 +13,9 @@ import socket if 'eecs1' in socket.gethostname(): MITX_ROOT_URL = '/mitx2' -from envs.common import * -from envs.logsettings import get_logger_config -from dev import * +from .common import * +from .logsettings import get_logger_config +from .dev import * if 'eecs1' in socket.gethostname(): MITX_ROOT_URL = '/mitx2' diff --git a/lms/envs/devplus.py b/lms/envs/devplus.py index 1c81bdd7b2..32e0a7beb7 100644 --- a/lms/envs/devplus.py +++ b/lms/envs/devplus.py @@ -13,7 +13,7 @@ Dir structure: /log # Where we're going to write log files """ -from envs.dev import * +from .dev import * DATABASES = { 'default': { diff --git a/lms/envs/static.py b/lms/envs/static.py index 55469ce332..179f9160c5 100644 --- a/lms/envs/static.py +++ b/lms/envs/static.py @@ -7,8 +7,8 @@ sessions. Assumes structure: /mitx # The location of this repo /log # Where we're going to write log files """ -from envs.common import * -from envs.logsettings import get_logger_config +from .common import * +from .logsettings import get_logger_config STATIC_GRAB = True diff --git a/lms/envs/test.py b/lms/envs/test.py index 6702a3c852..1d90fecc69 100644 --- a/lms/envs/test.py +++ b/lms/envs/test.py @@ -7,8 +7,8 @@ sessions. Assumes structure: /mitx # The location of this repo /log # Where we're going to write log files """ -from envs.common import * -from envs.logsettings import get_logger_config +from .common import * +from .logsettings import get_logger_config import os INSTALLED_APPS = [ diff --git a/lms/envs/test_ike.py b/lms/envs/test_ike.py index 2d319ff281..8bdecb3c8f 100644 --- a/lms/envs/test_ike.py +++ b/lms/envs/test_ike.py @@ -7,8 +7,8 @@ sessions. Assumes structure: /mitx # The location of this repo /log # Where we're going to write log files """ -from envs.common import * -from envs.logsettings import get_logger_config +from .common import * +from .logsettings import get_logger_config import os DEBUG = True