Ticket #32669: 32669-autoreload-fix.patch.diff

django/utils/autoreload.py

@@ -222 +222 @@
     args = [sys.executable] + ['-W%s' % o for o in sys.warnoptions]
     # __spec__ is set when the server was started with the `-m` option,
     # see https://docs.python.org/3/reference/import.html#main-spec
-    if __main__.__spec__ is not None and __main__.__spec__.parent:
-        args += ['-m', __main__.__spec__.parent]
-        args += sys.argv[1:]
+    if __main__.__spec__ is not None:
+        modspec = __main__.__spec__
+        if modspec.name.split(".")[-1] == "__main__" and modspec.parent:
+            args += ['-m', modspec.parent]
+            args += sys.argv[1:]
+        else:
+            args += ['-m', modspec.name]
+            args += sys.argv[1:]
+
     elif not py_script.exists():
         # sys.argv[0] may not exist for several reasons on Windows.
         # It may exist with a .exe extension or have a -script.py suffix.

tests/utils_tests/test_autoreload.py

@@ -24 +24 @@
 from django.utils.autoreload import WatchmanUnavailable
 
 from .test_module import __main__ as test_main
+from .test_module import main_module as test_main_module
 from .utils import on_macos_with_hfs
 
 
@@ -182 +183 @@
             [sys.executable, '-m', 'utils_tests.test_module', 'runserver'],
         )
 
+    @mock.patch.dict(sys.modules, {'__main__': test_main_module})
+    @mock.patch('sys.argv', [test_main.__file__, 'runserver'])
+    @mock.patch('sys.warnoptions', [])
+    def test_run_as_non_django_module(self):
+        self.assertEqual(
+            autoreload.get_child_arguments(),
+            [sys.executable, '-m', 'utils_tests.test_module.main_module', 'runserver'],
+        )
+
     @mock.patch('sys.argv', [__file__, 'runserver'])
     @mock.patch('sys.warnoptions', ['error'])
     def test_warnoptions(self):