From 05ef002048d88b8c2bcf643694ab9349c818b464 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 12 Aug 2008 13:39:46 +0000 Subject: [PATCH] Fixed #8246 -- Corrected the handling of settings files. Thanks to AdamG and chrj for their parallel reports and fixes. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8323 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/management/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py index 74e2b9d211..6f883ee7bb 100644 --- a/django/core/management/__init__.py +++ b/django/core/management/__init__.py @@ -104,7 +104,12 @@ def get_commands(): # Find the project directory try: from django.conf import settings - project_directory = setup_environ(__import__(settings.SETTINGS_MODULE)) + project_directory = setup_environ( + __import__( + settings.SETTINGS_MODULE, {}, {}, + (settings.SETTINGS_MODULE.split(".")[-1],) + ) + ) except (AttributeError, EnvironmentError, ImportError): project_directory = None @@ -310,6 +315,7 @@ def setup_environ(settings_mod): # Set DJANGO_SETTINGS_MODULE appropriately. os.environ['DJANGO_SETTINGS_MODULE'] = '%s.%s' % (project_name, settings_name) + return project_directory def execute_from_command_line(argv=None): """