Ticket #9482: 9482-DJANGO_SETTINGS_MODULE-r9295.diff

django/core/management/__init__.py

@@ -312 +312 @@
         project_directory = os.getcwd()
     project_name = os.path.basename(project_directory)
     settings_name = os.path.splitext(settings_filename)[0]
-    sys.path.append(os.path.join(project_directory, os.pardir))
-    project_module = __import__(project_name, {}, {}, [''])
-    sys.path.pop()
-
     # Set DJANGO_SETTINGS_MODULE appropriately.
     if original_settings_path:
         os.environ['DJANGO_SETTINGS_MODULE'] = original_settings_path
     else:
         os.environ['DJANGO_SETTINGS_MODULE'] = '%s.%s' % (project_name, settings_name)
+    sys.path.append(os.path.join(project_directory, os.pardir))
+    project_module = __import__(project_name, {}, {}, [''])
+    sys.path.pop()
     return project_directory
 
 def execute_from_command_line(argv=None):