From 734edbb761730c46852d9a015576b91f83ab14bf Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 25 Mar 2012 19:57:08 +0200 Subject: [PATCH] Fixing a lingering bug with removing the conf modules. --- src/server/initial_setup.py | 9 ++++++--- src/server/mssp.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/server/initial_setup.py b/src/server/initial_setup.py index 0d4b694582..458acebf82 100644 --- a/src/server/initial_setup.py +++ b/src/server/initial_setup.py @@ -186,9 +186,12 @@ def at_initial_setup(): run a module settings.AT_INITIAL_SETUP_HOOK_MODULE and will fail silently if this does not exist or fails to load. """ - try: - mod = __import__(settings.AT_INITIAL_SETUP_HOOK_MODULE, fromlist=[None]) - except ImportError: + modname = settings.AT_INITIAL_SETUP_HOOK_MODULE + if not modname: + return + try: + mod = __import__(modname, fromlist=[None]) + except ImportError, ValueError: return print _(" Running at_initial_setup() hook.") if mod.__dict__.get("at_initial_setup", None): diff --git a/src/server/mssp.py b/src/server/mssp.py index bb6bf22727..6b9d2ac7fe 100644 --- a/src/server/mssp.py +++ b/src/server/mssp.py @@ -11,7 +11,7 @@ active players and so on. Most of these settings are de """ - +from django.conf import settings from src.utils import utils MSSP = chr(70)