p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #32783 -- Fixed crash of autoreloader when __main__ module doesn't have __spec__ attribute. 

Regression in ec6d2531c5.

Thanks JonathanNickelson for the report.
This commit is contained in:
Mariusz Felisiak 2021-05-26 11:19:47 +02:00 committed by GitHub
parent 1143f3bb5e
commit 12b19a1d76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/utils/autoreload.py
View File

@ -222,7 +222,8 @@ def get_child_arguments():
args = [sys.executable] + ['-W%s' % o for o in sys.warnoptions] args = [sys.executable] + ['-W%s' % o for o in sys.warnoptions]
# __spec__ is set when the server was started with the `-m` option, # __spec__ is set when the server was started with the `-m` option,
# see https://docs.python.org/3/reference/import.html#main-spec # see https://docs.python.org/3/reference/import.html#main-spec
if __main__.__spec__ is not None and __main__.__spec__.parent: # __spec__ may not exist, e.g. when running in a Conda env.
if getattr(__main__, '__spec__', None) is not None and __main__.__spec__.parent:
args += ['-m', __main__.__spec__.parent] args += ['-m', __main__.__spec__.parent]
args += sys.argv[1:] args += sys.argv[1:]
elif not py_script.exists(): elif not py_script.exists():

3
docs/releases/3.2.4.txt
View File

@ -25,3 +25,6 @@ Bugfixes
* Fixed a bug in Django 3.2 that would trigger the auto-reloader for template * Fixed a bug in Django 3.2 that would trigger the auto-reloader for template
changes when directory paths were specified with strings (:ticket:`32744`). changes when directory paths were specified with strings (:ticket:`32744`).
* Fixed a regression in Django 3.2 that caused a crash of auto-reloader with
``AttributeError``, e.g. inside a ``Conda`` environment (:ticket:`32783`).

11
tests/utils_tests/test_autoreload.py
View File

@ -219,6 +219,17 @@ class TestChildArguments(SimpleTestCase):
with self.assertRaisesMessage(RuntimeError, msg): with self.assertRaisesMessage(RuntimeError, msg):
autoreload.get_child_arguments() autoreload.get_child_arguments()
@mock.patch('sys.argv', [__file__, 'runserver'])
@mock.patch('sys.warnoptions', [])
def test_module_no_spec(self):
module = types.ModuleType('test_module')
del module.__spec__
with mock.patch.dict(sys.modules, {'__main__': module}):
self.assertEqual(
autoreload.get_child_arguments(),
[sys.executable, __file__, 'runserver']
)
class TestUtilities(SimpleTestCase): class TestUtilities(SimpleTestCase):
def test_is_django_module(self): def test_is_django_module(self):