Mercurial > cpython-lru_cache-weakref
diff Lib/test/test_types.py @ 46909:ef4ec968fdb6
Merged revisions 63078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
When forward porting this, I added _PyUnicode_InsertThousandsGrouping.
........
r63078 | eric.smith | 2008-05-11 15:52:48 -0400 (Sun, 11 May 2008) | 14 lines
Addresses issue 2802: 'n' formatting for integers.
Adds 'n' as a format specifier for integers, to mirror the same
specifier which is already available for floats. 'n' is the same as
'd', but inserts the current locale-specific thousands grouping.
I added this as a stringlib function, but it's only used by str type,
not unicode. This is because of an implementation detail in
unicode.format(), which does its own str->unicode conversion. But the
unicode version will be needed in 3.0, and it may be needed by other
code eventually in 2.6 (maybe decimal?), so I left it as a stringlib
implementation. As long as the unicode version isn't instantiated,
there's no overhead for this.
........
| author | Eric Smith <eric@trueblade.com> |
|---|---|
| date | Sun, 11 May 2008 21:00:57 +0000 |
| parents | 7b4081bec783 |
| children | 9c930a32cebb |
line wrap: on
line diff
--- a/Lib/test/test_types.py Sun May 11 20:51:18 2008 +0000 +++ b/Lib/test/test_types.py Sun May 11 21:00:57 2008 +0000 @@ -313,7 +313,7 @@ # ensure that float type specifiers work; format converts # the int to a float - for format_spec in 'eEfFgGn%': + for format_spec in 'eEfFgG%': for value in [0, 1, -1, 100, -100, 1234567890, -1234567890]: self.assertEqual(value.__format__(format_spec), float(value).__format__(format_spec)) @@ -403,7 +403,7 @@ # ensure that float type specifiers work; format converts # the long to a float - for format_spec in 'eEfFgGn%': + for format_spec in 'eEfFgG%': for value in [0, 1, -1, 100, -100, 1234567890, -1234567890]: self.assertEqual(value.__format__(format_spec), float(value).__format__(format_spec)) @@ -417,6 +417,17 @@ self.assertEqual(locale.format('%g', x, grouping=True), format(x, 'n')) self.assertEqual(locale.format('%.10g', x, grouping=True), format(x, '.10n')) + @run_with_locale('LC_NUMERIC', 'en_US.UTF8') + def test_int__format__locale(self): + # test locale support for __format__ code 'n' for integers + + x = 123456789012345678901234567890 + for i in range(0, 30): + self.assertEqual(locale.format('%d', x, grouping=True), format(x, 'n')) + + # move to the next integer to test + x = x // 10 + def test_float__format__(self): # these should be rewritten to use both format(x, spec) and # x.__format__(spec)