diff options
| author | Eric Rouleau <xblitz@gmail.com> | 2014-11-30 03:29:52 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-12-03 07:49:06 -0500 |
| commit | 9d1a69579b996eaa208f141b409141be63f597ec (patch) | |
| tree | ff1102914e734b8e3ab4f47d2fe3e77769593519 /django/utils/numberformat.py | |
| parent | adacbd64a062662f54d6e91dc4e460eff96b5dd5 (diff) | |
Fixed #23935 -- Converted decimals to fixed point in utils.numberformat.format
Diffstat (limited to 'django/utils/numberformat.py')
| -rw-r--r-- | django/utils/numberformat.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/django/utils/numberformat.py b/django/utils/numberformat.py index 6a31237f13..c3cf55bca5 100644 --- a/django/utils/numberformat.py +++ b/django/utils/numberformat.py @@ -1,3 +1,5 @@ +from decimal import Decimal + from django.conf import settings from django.utils.safestring import mark_safe from django.utils import six @@ -22,7 +24,10 @@ def format(number, decimal_sep, decimal_pos=None, grouping=0, thousand_sep='', return mark_safe(six.text_type(number)) # sign sign = '' - str_number = six.text_type(number) + if isinstance(number, Decimal): + str_number = '{:f}'.format(number) + else: + str_number = six.text_type(number) if str_number[0] == '-': sign = '-' str_number = str_number[1:] |
