Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #11944 -- Improved exception handling for the filesizeformat fi…

…lter. Thanks to rfk for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e6740cb39c94bb404797e6baed7bcdf534c422ed 1 parent 0e5836d
@freakboy3742 freakboy3742 authored
View
2  django/template/defaultfilters.py
@@ -799,7 +799,7 @@ def filesizeformat(bytes):
"""
try:
bytes = float(bytes)
- except TypeError:
+ except (TypeError,ValueError,UnicodeDecodeError):
return u"0 bytes"
if bytes < 1024:
View
9 tests/regressiontests/defaultfilters/tests.py
@@ -476,6 +476,15 @@
>>> filesizeformat(1024*1024*1024)
u'1.0 GB'
+>>> filesizeformat(complex(1,-1))
+u'0 bytes'
+
+>>> filesizeformat("")
+u'0 bytes'
+
+>>> filesizeformat(u"\N{GREEK SMALL LETTER ALPHA}")
+u'0 bytes'
+
>>> pluralize(1)
u''
Please sign in to comment.
Something went wrong with that request. Please try again.