mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-22 17:16:24 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #25624 -- Fixed autoreload crash with jinja2.ModuleLoader.

Browse Source
This commit is contained in:
Tom Forbes 2019-01-19 00:16:33 +00:00 committed by Tim Graham
parent 62b8596616
commit 1e92407f83
2 changed files with 10 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

@ -9,6 +9,7 @@ import sys
import threading
import time
import traceback
import weakref
from collections import defaultdict
from pathlib import Path
from types import ModuleType
@ -98,7 +99,7 @@ def iter_all_python_module_files():
# This ensures cached results are returned in the usual case that modules
# aren't loaded on the fly.
modules_view = sorted(list(sys.modules.items()), key=lambda i: i[0])
modules = tuple(m[1] for m in modules_view)
modules = tuple(m[1] for m in modules_view if not isinstance(m[1], weakref.ProxyTypes))
return iter_modules_and_files(modules, frozenset(_error_files))

8
tests/utils_tests/test_autoreload.py
View File

@ -6,6 +6,7 @@ import sys
import tempfile
import threading
import time
import weakref
import zipfile
from importlib import import_module
from pathlib import Path
@ -116,6 +117,13 @@ class TestIterModulesAndFiles(SimpleTestCase):
self.import_and_cleanup('test_compiled')
self.assertFileFound(compiled_file)
def test_weakref_in_sys_module(self):
"""iter_all_python_module_file() ignores weakref modules."""
time_proxy = weakref.proxy(time)
sys.modules['time_proxy'] = time_proxy
self.addCleanup(lambda: sys.modules.pop('time_proxy', None))
list(autoreload.iter_all_python_module_files()) # No crash.
class TestCommonRoots(SimpleTestCase):
def test_common_roots(self):