Ticket #9751: 06-fix-project_name-location-when-settings-is-a-module.patch

core/management/__init__.py

@@ -310 +310 @@
     project_directory, settings_filename = os.path.split(settings_mod.__file__)
     if project_directory == os.curdir or not project_directory:
         project_directory = os.getcwd()
-    project_name = os.path.basename(project_directory)
 
     # Strip filename suffix to get the module name.
     settings_name = os.path.splitext(settings_filename)[0]
@@ -319 +318 @@
     if settings_name.endswith("$py"):
         settings_name = settings_name[:-3]
 
+    if settings_name == '__init__':
+        # Settings is a module; thus the project directory and settings_name
+        # must be gleaned from one level higher up the path.
+        project_directory = os.path.dirname(project_directory)
+        settings_name = os.path.basename(os.path.dirname(settings_mod.__file__))
+
+    project_name = os.path.basename(project_directory)
+
     # Set DJANGO_SETTINGS_MODULE appropriately.
     if original_settings_path:
         os.environ['DJANGO_SETTINGS_MODULE'] = original_settings_path