From 575706331bec4bf58ce36a9540c4c61fca49025b Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 29 Jan 2016 10:36:58 -0500 Subject: [PATCH] Cosmetic cleanups in tests/utils_tests/test_numberformat.py --- tests/utils_tests/test_numberformat.py | 44 ++++++++++++-------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/tests/utils_tests/test_numberformat.py b/tests/utils_tests/test_numberformat.py index d963bd284b..3dd1b0644f 100644 --- a/tests/utils_tests/test_numberformat.py +++ b/tests/utils_tests/test_numberformat.py @@ -14,38 +14,36 @@ class TestNumberFormat(TestCase): self.assertEqual(nformat(1234, '.'), '1234') self.assertEqual(nformat(1234.2, '.'), '1234.2') self.assertEqual(nformat(1234, '.', decimal_pos=2), '1234.00') - self.assertEqual(nformat(1234, '.', grouping=2, thousand_sep=','), - '1234') - self.assertEqual(nformat(1234, '.', grouping=2, thousand_sep=',', - force_grouping=True), '12,34') + self.assertEqual(nformat(1234, '.', grouping=2, thousand_sep=','), '1234') + self.assertEqual(nformat(1234, '.', grouping=2, thousand_sep=',', force_grouping=True), '12,34') self.assertEqual(nformat(-1234.33, '.', decimal_pos=1), '-1234.3') def test_format_string(self): self.assertEqual(nformat('1234', '.'), '1234') self.assertEqual(nformat('1234.2', '.'), '1234.2') self.assertEqual(nformat('1234', '.', decimal_pos=2), '1234.00') - self.assertEqual(nformat('1234', '.', grouping=2, thousand_sep=','), - '1234') - self.assertEqual(nformat('1234', '.', grouping=2, thousand_sep=',', - force_grouping=True), '12,34') + self.assertEqual(nformat('1234', '.', grouping=2, thousand_sep=','), '1234') + self.assertEqual(nformat('1234', '.', grouping=2, thousand_sep=',', force_grouping=True), '12,34') self.assertEqual(nformat('-1234.33', '.', decimal_pos=1), '-1234.3') - self.assertEqual(nformat('10000', '.', grouping=3, - thousand_sep='comma', force_grouping=True), - '10comma000') + self.assertEqual(nformat('10000', '.', grouping=3, thousand_sep='comma', force_grouping=True), '10comma000') def test_large_number(self): - most_max = ('{}179769313486231570814527423731704356798070567525844996' - '598917476803157260780028538760589558632766878171540458953' - '514382464234321326889464182768467546703537516986049910576' - '551282076245490090389328944075868508455133942304583236903' - '222948165808559332123348274797826204144723168738177180919' - '29988125040402618412485836{}') - most_max2 = ('{}35953862697246314162905484746340871359614113505168999' - '31978349536063145215600570775211791172655337563430809179' - '07028764928468642653778928365536935093407075033972099821' - '15310256415249098018077865788815173701691026788460916647' - '38064458963316171186642466965495956524082894463374763543' - '61838599762500808052368249716736') + most_max = ( + '{}179769313486231570814527423731704356798070567525844996' + '598917476803157260780028538760589558632766878171540458953' + '514382464234321326889464182768467546703537516986049910576' + '551282076245490090389328944075868508455133942304583236903' + '222948165808559332123348274797826204144723168738177180919' + '29988125040402618412485836{}' + ) + most_max2 = ( + '{}35953862697246314162905484746340871359614113505168999' + '31978349536063145215600570775211791172655337563430809179' + '07028764928468642653778928365536935093407075033972099821' + '15310256415249098018077865788815173701691026788460916647' + '38064458963316171186642466965495956524082894463374763543' + '61838599762500808052368249716736' + ) int_max = int(float_info.max) self.assertEqual(nformat(int_max, '.'), most_max.format('', '8')) self.assertEqual(nformat(int_max + 1, '.'), most_max.format('', '9'))