Context Navigation

Ticket #11944: filesizeformat.diff

File filesizeformat.diff, 921 bytes (added by Ryan Kelly, 15 years ago)

diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
index 47e116c..0fabe84 100644

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

diff --git a/tests/regressiontests/defaultfilters/tests.py b/tests/regressiontests/defaultfilters/tests.py
index 4343586..0fe4673 100644

                u'1024.0 MB'
 >>> 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''