Ticket #5943: 5943-django-admin-8295.diff

django/core/management/__init__.py

@@ -104 +104 @@
         # Find the project directory
         try:
             from django.conf import settings
-            project_directory = setup_environ(__import__(settings.SETTINGS_MODULE))
+            settings_mod = __import__(settings.SETTINGS_MODULE, {}, {}, 
+                             [settings.SETTINGS_MODULE.split('.')[-1]])
+            project_directory = setup_environ(settings_mod)
         except (AttributeError, EnvironmentError, ImportError):
             project_directory = None
 
@@ -310 +312 @@
 
     # 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):
     """