1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Fixed #11944 -- Improved exception handling for the filesizeformat filter. Thanks to rfk for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee
2010-02-13 14:37:17 +00:00
parent 0e5836dc07
commit e6740cb39c
2 changed files with 10 additions and 1 deletions

View File

@@ -799,7 +799,7 @@ def filesizeformat(bytes):
"""
try:
bytes = float(bytes)
except TypeError:
except (TypeError,ValueError,UnicodeDecodeError):
return u"0 bytes"
if bytes < 1024: