mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 01:38:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #22315 -- str/bytes mismatch in staticfiles

Browse source 
Previously, `ManifestFilesMixin.read_manifest` failed in Python 3
because `json.loads` accepts `str` not `bytes`.
This commit is contained in:
David Evans 2014-03-22 21:57:01 +00:00 • committed by Tim Graham
parent e3c4205b79
commit 86dcac4634
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
django/contrib/staticfiles/storage.py
View file

@ -292,7 +292,7 @@ class ManifestFilesMixin(HashedFilesMixin):
def read_manifest(self):
try:
with self.open(self.manifest_name) as manifest:
return manifest.read()
return manifest.read().decode('utf-8')
except IOError:
return None
@ -319,7 +319,8 @@ class ManifestFilesMixin(HashedFilesMixin):
payload = {'paths': self.hashed_files, 'version': self.manifest_version}
if self.exists(self.manifest_name):
self.delete(self.manifest_name)
self._save(self.manifest_name, ContentFile(json.dumps(payload)))
contents = json.dumps(payload).encode('utf-8')
self._save(self.manifest_name, ContentFile(contents))
class _MappingCache(object):