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

Fixed #30647 -- Fixed crash of autoreloader when extra directory cannot be resolved.

This commit is contained in:
Tom Forbes 2019-07-21 22:28:39 +01:00 committed by Mariusz Felisiak
parent fed5e19369
commit fc75694257
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/utils/autoreload.py
View File

@ -240,8 +240,15 @@ class BaseReloader:
def watch_dir(self, path, glob): def watch_dir(self, path, glob):
path = Path(path) path = Path(path)
if not path.is_absolute(): try:
raise ValueError('%s must be absolute.' % path) path = path.absolute()
except FileNotFoundError:
logger.debug(
'Unable to watch directory %s as it cannot be resolved.',
path,
exc_info=True,
)
return
logger.debug('Watching dir %s with glob %s.', path, glob) logger.debug('Watching dir %s with glob %s.', path, glob)
self.directory_globs[path].add(glob) self.directory_globs[path].add(glob)

3
django/utils/translation/reloader.py
View File

@ -14,8 +14,7 @@ def watch_for_translation_changes(sender, **kwargs):
directories.extend(Path(config.path) / 'locale' for config in apps.get_app_configs()) directories.extend(Path(config.path) / 'locale' for config in apps.get_app_configs())
directories.extend(Path(p) for p in settings.LOCALE_PATHS) directories.extend(Path(p) for p in settings.LOCALE_PATHS)
for path in directories: for path in directories:
absolute_path = path.absolute() sender.watch_dir(path, '**/*.mo')
sender.watch_dir(absolute_path, '**/*.mo')
def translation_file_changed(sender, file_path, **kwargs): def translation_file_changed(sender, file_path, **kwargs):

3
docs/releases/2.2.4.txt
View File

@ -21,3 +21,6 @@ Bugfixes
* Fixed a regression in Django 2.2 where auto-reloader crashes if a file path * Fixed a regression in Django 2.2 where auto-reloader crashes if a file path
contains nulls characters (``'\x00'``) (:ticket:`30506`). contains nulls characters (``'\x00'``) (:ticket:`30506`).
* Fixed a regression in Django 2.2 where auto-reloader crashes if a translation
directory cannot be resolved (:ticket:`30647`).

6
tests/utils_tests/test_autoreload.py
View File

@ -499,6 +499,12 @@ class IntegrationTests:
class BaseReloaderTests(ReloaderTests): class BaseReloaderTests(ReloaderTests):
RELOADER_CLS = autoreload.BaseReloader RELOADER_CLS = autoreload.BaseReloader
def test_watch_dir_with_unresolvable_path(self):
path = Path('unresolvable_directory')
with mock.patch.object(Path, 'absolute', side_effect=FileNotFoundError):
self.reloader.watch_dir(path, '**/*.mo')
self.assertEqual(list(self.reloader.directory_globs), [])
def test_watch_with_glob(self): def test_watch_with_glob(self):
self.reloader.watch_dir(self.tempdir, '*.py') self.reloader.watch_dir(self.tempdir, '*.py')
watched_files = list(self.reloader.watched_files()) watched_files = list(self.reloader.watched_files())