diff options
| author | Tom Forbes <tom@tomforb.es> | 2019-06-26 05:44:10 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-06-26 06:44:10 +0200 |
| commit | 8454f6dea49dddb821bfcb7569ea222bb487dfd1 (patch) | |
| tree | 9edde9702497d00d929f54c8490953f72770ca25 | |
| parent | 698df6a009cb1c4dbd55905264f24f6edf41066e (diff) | |
Fixed #30588 -- Fixed crash of autoreloader when __main__ module doesn't have __file__ attribute.
| -rw-r--r-- | django/utils/autoreload.py | 4 | ||||
| -rw-r--r-- | docs/releases/2.2.3.txt | 3 | ||||
| -rw-r--r-- | tests/utils_tests/test_autoreload.py | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/django/utils/autoreload.py b/django/utils/autoreload.py index d33ee9096d..3a0d5fbe73 100644 --- a/django/utils/autoreload.py +++ b/django/utils/autoreload.py @@ -120,7 +120,9 @@ def iter_modules_and_files(modules, extra_files): # __main__ (usually manage.py) doesn't always have a __spec__ set. # Handle this by falling back to using __file__, resolved below. # See https://docs.python.org/reference/import.html#main-spec - sys_file_paths.append(module.__file__) + # __file__ may not exists, e.g. when running ipdb debugger. + if hasattr(module, '__file__'): + sys_file_paths.append(module.__file__) continue if getattr(module, '__spec__', None) is None: continue diff --git a/docs/releases/2.2.3.txt b/docs/releases/2.2.3.txt index a42e57c779..08c5601349 100644 --- a/docs/releases/2.2.3.txt +++ b/docs/releases/2.2.3.txt @@ -12,3 +12,6 @@ Bugfixes * Fixed a regression in Django 2.2 where :class:`~django.db.models.Avg`, :class:`~django.db.models.StdDev`, and :class:`~django.db.models.Variance` 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`). diff --git a/tests/utils_tests/test_autoreload.py b/tests/utils_tests/test_autoreload.py index f130d216cc..1ea019ac7a 100644 --- a/tests/utils_tests/test_autoreload.py +++ b/tests/utils_tests/test_autoreload.py @@ -136,6 +136,10 @@ class TestIterModulesAndFiles(SimpleTestCase): main_module = sys.modules['__main__'] 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): def test_common_roots(self): |