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

Fixed #30588 -- Fixed crash of autoreloader when __main__ module doesn't have __file__ attribute.

This commit is contained in:
Tom Forbes 2019-06-26 05:44:10 +01:00 committed by Mariusz Felisiak
parent 698df6a009
commit 8454f6dea4
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/utils/autoreload.py
View File

@ -120,6 +120,8 @@ def iter_modules_and_files(modules, extra_files):
# __main__ (usually manage.py) doesn't always have a __spec__ set. # __main__ (usually manage.py) doesn't always have a __spec__ set.
# Handle this by falling back to using __file__, resolved below. # Handle this by falling back to using __file__, resolved below.
# See https://docs.python.org/reference/import.html#main-spec # See https://docs.python.org/reference/import.html#main-spec
# __file__ may not exists, e.g. when running ipdb debugger.
if hasattr(module, '__file__'):
sys_file_paths.append(module.__file__) sys_file_paths.append(module.__file__)
continue continue
if getattr(module, '__spec__', None) is None: if getattr(module, '__spec__', None) is None:

3
docs/releases/2.2.3.txt
View File

@ -12,3 +12,6 @@ Bugfixes
* Fixed a regression in Django 2.2 where :class:`~django.db.models.Avg`, * Fixed a regression in Django 2.2 where :class:`~django.db.models.Avg`,
:class:`~django.db.models.StdDev`, and :class:`~django.db.models.Variance` :class:`~django.db.models.StdDev`, and :class:`~django.db.models.Variance`
crash with ``filter`` argument (:ticket:`30542`). crash with ``filter`` argument (:ticket:`30542`).
* Fixed a regression in Django 2.2.2 where auto-reloader crashes with
``AttributeError``, e.g. when using ``ipdb`` (:ticket:`30588`).

4
tests/utils_tests/test_autoreload.py
View File

@ -136,6 +136,10 @@ class TestIterModulesAndFiles(SimpleTestCase):
main_module = sys.modules['__main__'] main_module = sys.modules['__main__']
self.assertFileFound(Path(main_module.__file__)) self.assertFileFound(Path(main_module.__file__))
def test_main_module_without_file_is_not_resolved(self):
fake_main = types.ModuleType('__main__')
self.assertEqual(autoreload.iter_modules_and_files((fake_main,), frozenset()), frozenset())
class TestCommonRoots(SimpleTestCase): class TestCommonRoots(SimpleTestCase):
def test_common_roots(self): def test_common_roots(self):