From 4f45e0a083fef225afccf23ededa19775f315352 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 29 Apr 2015 15:09:55 +0900 Subject: [PATCH] Prior lost minus sign for fractional negative numbers --- lib/util.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/util.py b/lib/util.py index 3744d8fd..3de3e0cf 100644 --- a/lib/util.py +++ b/lib/util.py @@ -110,12 +110,12 @@ def user_dir(): def format_satoshis(x, is_diff=False, num_zeros = 0, decimal_point = 8, whitespaces=False): from locale import localeconv x = int(x) # Some callers pass Decimal - if is_diff: - fmt = "{:+n}" - else: - fmt = "{:n}" scale_factor = pow (10, decimal_point) - integer_part = fmt.format(int(x / float(scale_factor))) + integer_part = "{:n}".format(int(abs(x) / float(scale_factor))) + if x < 0: + integer_part = '-' + integer_part + elif is_diff: + integer_part = '+' + integer_part dp = localeconv()['decimal_point'] fract_part = ("{:0" + str(decimal_point) + "}").format(abs(x) % scale_factor) fract_part = fract_part.rstrip('0')