From 1e89a208d0d741558c31a161222e8aa96764e08c Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Wed, 18 Jul 2012 14:59:12 +0200
Subject: [PATCH] Fixed #18645 -- Clarified filesizeformat implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Thanks Jérôme Renard for the patch.
---
django/template/defaultfilters.py | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
index d2c5b03f30..b9cdd94296 100644
--- a/django/template/defaultfilters.py
+++ b/django/template/defaultfilters.py
@@ -827,17 +827,23 @@ def filesizeformat(bytes):
filesize_number_format = lambda value: formats.number_format(round(value, 1), 1)
- if bytes < 1024:
+ KB = 1<<10
+ MB = 1<<20
+ GB = 1<<30
+ TB = 1<<40
+ PB = 1<<50
+
+ if bytes < KB:
return ungettext("%(size)d byte", "%(size)d bytes", bytes) % {'size': bytes}
- if bytes < 1024 * 1024:
- return ugettext("%s KB") % filesize_number_format(bytes / 1024)
- if bytes < 1024 * 1024 * 1024:
- return ugettext("%s MB") % filesize_number_format(bytes / (1024 * 1024))
- if bytes < 1024 * 1024 * 1024 * 1024:
- return ugettext("%s GB") % filesize_number_format(bytes / (1024 * 1024 * 1024))
- if bytes < 1024 * 1024 * 1024 * 1024 * 1024:
- return ugettext("%s TB") % filesize_number_format(bytes / (1024 * 1024 * 1024 * 1024))
- return ugettext("%s PB") % filesize_number_format(bytes / (1024 * 1024 * 1024 * 1024 * 1024))
+ if bytes < MB:
+ return ugettext("%s KB") % filesize_number_format(bytes / KB)
+ if bytes < GB:
+ return ugettext("%s MB") % filesize_number_format(bytes / MB)
+ if bytes < TB:
+ return ugettext("%s GB") % filesize_number_format(bytes / GB)
+ if bytes < PB:
+ return ugettext("%s TB") % filesize_number_format(bytes / TB)
+ return ugettext("%s PB") % filesize_number_format(bytes / PB)
@register.filter(is_safe=False)
def pluralize(value, arg='s'):