innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #30599 -- Prevented ManifestFilesMixin.read_manifest() from silencing errors other than FileNotFoundError.

This commit is contained in:
zeyneloz 2019-08-01 16:42:58 +02:00 committed by Mariusz Felisiak
parent 246689452d
commit 955b382600
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/staticfiles/storage.py
View File

@ -382,7 +382,7 @@ class ManifestFilesMixin(HashedFilesMixin):
try: try:
with self.open(self.manifest_name) as manifest: with self.open(self.manifest_name) as manifest:
return manifest.read().decode() return manifest.read().decode()
except OSError: except FileNotFoundError:
return None return None
def load_manifest(self): def load_manifest(self):

6
tests/staticfiles_tests/test_storage.py
View File

@ -4,6 +4,7 @@ import sys
import tempfile import tempfile
import unittest import unittest
from io import StringIO from io import StringIO
from unittest import mock
from django.conf import settings from django.conf import settings
from django.contrib.staticfiles import finders, storage from django.contrib.staticfiles import finders, storage
@ -389,6 +390,11 @@ class TestCollectionManifestStorage(TestHashedFiles, CollectionTestCase):
storage.staticfiles_storage.manifest_name = 'does.not.exist.json' storage.staticfiles_storage.manifest_name = 'does.not.exist.json'
self.assertIsNone(storage.staticfiles_storage.read_manifest()) self.assertIsNone(storage.staticfiles_storage.read_manifest())
def test_manifest_does_not_ignore_permission_error(self):
with mock.patch('builtins.open', side_effect=PermissionError):
with self.assertRaises(PermissionError):
storage.staticfiles_storage.read_manifest()
def test_loaded_cache(self): def test_loaded_cache(self):
self.assertNotEqual(storage.staticfiles_storage.hashed_files, {}) self.assertNotEqual(storage.staticfiles_storage.hashed_files, {})
manifest_content = storage.staticfiles_storage.read_manifest() manifest_content = storage.staticfiles_storage.read_manifest()