Fixed #2914: filesizeformat no longer dies on invalid values. Thanks, dev@simon.net.nz

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 04:58:10 +00:00 · 2006-11-07 04:58:10 +00:00 · 92151b2d28
parent febe05b9ef
commit 92151b2d28
1 changed files with 5 additions and 1 deletions
--- a/django/template/defaultfilters.py
+++ b/django/template/defaultfilters.py
@ -421,7 +421,11 @@ def filesizeformat(bytes):
    Format the value like a 'human-readable' file size (i.e. 13 KB, 4.1 MB, 102
    bytes, etc).
    """
-    bytes = float(bytes)
+    try:
+        bytes = float(bytes)
+    except TypeError:
+        return "0 bytes"
+        
    if bytes < 1024:
        return "%d byte%s" % (bytes, bytes != 1 and 's' or '')
    if bytes < 1024 * 1024: