Ticket #10966: project_module_optional.2.patch

django/core/management/__init__.py

@@ -331 +331 @@
     if settings_name.endswith("$py"):
         settings_name = settings_name[:-3]
 
+    # Decide whether to treat the project directory as a Python package.
+    project_is_package = '__init__.py' in os.listdir(project_directory)
+
     # Set DJANGO_SETTINGS_MODULE appropriately.
     if original_settings_path:
-        os.environ['DJANGO_SETTINGS_MODULE'] = original_settings_path
+        envvar = original_settings_path
+    elif project_is_package:
+        envvar = '%s.%s' % (project_name, settings_name)
     else:
-        os.environ['DJANGO_SETTINGS_MODULE'] = '%s.%s' % (project_name, settings_name)
+        envvar = settings_name
+    os.environ['DJANGO_SETTINGS_MODULE'] = envvar
 
     # Import the project module. We add the parent directory to PYTHONPATH to
     # avoid some of the path errors new users can have.
-    sys.path.append(os.path.join(project_directory, os.pardir))
-    project_module = import_module(project_name)
-    sys.path.pop()
+    if project_is_package:
+        sys.path.append(os.path.join(project_directory, os.pardir))
+        project_module = import_module(project_name)
+        sys.path.pop()
 
     return project_directory