Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
from test.support import run_unittest, verbose
|
2008-07-25 18:45:08 -03:00
|
|
|
import unittest
|
2001-04-13 05:09:50 -03:00
|
|
|
import locale
|
2001-04-15 10:15:56 -03:00
|
|
|
import sys
|
2008-07-25 18:45:08 -03:00
|
|
|
import codecs
|
2001-04-13 05:09:50 -03:00
|
|
|
|
2008-07-26 18:02:53 -03:00
|
|
|
enUS_locale = None
|
2008-07-25 18:45:08 -03:00
|
|
|
|
2008-07-26 18:02:53 -03:00
|
|
|
def get_enUS_locale():
|
|
|
|
global enUS_locale
|
2008-07-25 18:45:08 -03:00
|
|
|
if sys.platform.startswith("win"):
|
|
|
|
tlocs = ("En", "English")
|
2001-04-13 05:09:50 -03:00
|
|
|
else:
|
2009-10-19 16:47:59 -03:00
|
|
|
tlocs = ("en_US.UTF-8", "en_US.ISO8859-1", "en_US.US-ASCII", "en_US")
|
2008-07-26 18:02:53 -03:00
|
|
|
oldlocale = locale.setlocale(locale.LC_NUMERIC)
|
|
|
|
for tloc in tlocs:
|
|
|
|
try:
|
|
|
|
locale.setlocale(locale.LC_NUMERIC, tloc)
|
|
|
|
except locale.Error:
|
|
|
|
continue
|
|
|
|
break
|
|
|
|
else:
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
raise unittest.SkipTest(
|
2008-07-26 18:02:53 -03:00
|
|
|
"Test locale not supported (tried %s)" % (', '.join(tlocs)))
|
|
|
|
enUS_locale = tloc
|
|
|
|
locale.setlocale(locale.LC_NUMERIC, oldlocale)
|
|
|
|
|
|
|
|
|
|
|
|
class BaseLocalizedTest(unittest.TestCase):
|
|
|
|
#
|
|
|
|
# Base class for tests using a real locale
|
|
|
|
#
|
2008-07-25 18:45:08 -03:00
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
self.oldlocale = locale.setlocale(self.locale_type)
|
2008-07-26 18:02:53 -03:00
|
|
|
locale.setlocale(self.locale_type, enUS_locale)
|
2001-04-13 05:09:50 -03:00
|
|
|
if verbose:
|
2008-07-26 18:02:53 -03:00
|
|
|
print("testing with \"%s\"..." % enUS_locale, end=' ')
|
2008-07-25 18:45:08 -03:00
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
locale.setlocale(self.locale_type, self.oldlocale)
|
|
|
|
|
|
|
|
|
|
|
|
class BaseCookedTest(unittest.TestCase):
|
|
|
|
#
|
|
|
|
# Base class for tests using cooked localeconv() values
|
|
|
|
#
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
locale._override_localeconv = self.cooked_values
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
locale._override_localeconv = {}
|
|
|
|
|
|
|
|
class CCookedTest(BaseCookedTest):
|
|
|
|
# A cooked "C" locale
|
|
|
|
|
|
|
|
cooked_values = {
|
|
|
|
'currency_symbol': '',
|
|
|
|
'decimal_point': '.',
|
|
|
|
'frac_digits': 127,
|
|
|
|
'grouping': [],
|
|
|
|
'int_curr_symbol': '',
|
|
|
|
'int_frac_digits': 127,
|
|
|
|
'mon_decimal_point': '',
|
|
|
|
'mon_grouping': [],
|
|
|
|
'mon_thousands_sep': '',
|
|
|
|
'n_cs_precedes': 127,
|
|
|
|
'n_sep_by_space': 127,
|
|
|
|
'n_sign_posn': 127,
|
|
|
|
'negative_sign': '',
|
|
|
|
'p_cs_precedes': 127,
|
|
|
|
'p_sep_by_space': 127,
|
|
|
|
'p_sign_posn': 127,
|
|
|
|
'positive_sign': '',
|
|
|
|
'thousands_sep': ''
|
|
|
|
}
|
|
|
|
|
|
|
|
class EnUSCookedTest(BaseCookedTest):
|
|
|
|
# A cooked "en_US" locale
|
|
|
|
|
|
|
|
cooked_values = {
|
|
|
|
'currency_symbol': '$',
|
|
|
|
'decimal_point': '.',
|
|
|
|
'frac_digits': 2,
|
|
|
|
'grouping': [3, 3, 0],
|
|
|
|
'int_curr_symbol': 'USD ',
|
|
|
|
'int_frac_digits': 2,
|
|
|
|
'mon_decimal_point': '.',
|
|
|
|
'mon_grouping': [3, 3, 0],
|
|
|
|
'mon_thousands_sep': ',',
|
|
|
|
'n_cs_precedes': 1,
|
|
|
|
'n_sep_by_space': 0,
|
|
|
|
'n_sign_posn': 1,
|
|
|
|
'negative_sign': '-',
|
|
|
|
'p_cs_precedes': 1,
|
|
|
|
'p_sep_by_space': 0,
|
|
|
|
'p_sign_posn': 1,
|
|
|
|
'positive_sign': '',
|
|
|
|
'thousands_sep': ','
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-03-13 21:13:13 -03:00
|
|
|
class FrFRCookedTest(BaseCookedTest):
|
|
|
|
# A cooked "fr_FR" locale with a space character as decimal separator
|
|
|
|
# and a non-ASCII currency symbol.
|
|
|
|
|
|
|
|
cooked_values = {
|
|
|
|
'currency_symbol': '\u20ac',
|
|
|
|
'decimal_point': ',',
|
|
|
|
'frac_digits': 2,
|
|
|
|
'grouping': [3, 3, 0],
|
|
|
|
'int_curr_symbol': 'EUR ',
|
|
|
|
'int_frac_digits': 2,
|
|
|
|
'mon_decimal_point': ',',
|
|
|
|
'mon_grouping': [3, 3, 0],
|
|
|
|
'mon_thousands_sep': ' ',
|
|
|
|
'n_cs_precedes': 0,
|
|
|
|
'n_sep_by_space': 1,
|
|
|
|
'n_sign_posn': 1,
|
|
|
|
'negative_sign': '-',
|
|
|
|
'p_cs_precedes': 0,
|
|
|
|
'p_sep_by_space': 1,
|
|
|
|
'p_sign_posn': 1,
|
|
|
|
'positive_sign': '',
|
|
|
|
'thousands_sep': ' '
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-07-25 18:45:08 -03:00
|
|
|
class BaseFormattingTest(object):
|
|
|
|
#
|
|
|
|
# Utility functions for formatting tests
|
|
|
|
#
|
|
|
|
|
|
|
|
def _test_formatfunc(self, format, value, out, func, **format_opts):
|
|
|
|
self.assertEqual(
|
|
|
|
func(format, value, **format_opts), out)
|
|
|
|
|
|
|
|
def _test_format(self, format, value, out, **format_opts):
|
|
|
|
self._test_formatfunc(format, value, out,
|
|
|
|
func=locale.format, **format_opts)
|
|
|
|
|
|
|
|
def _test_format_string(self, format, value, out, **format_opts):
|
|
|
|
self._test_formatfunc(format, value, out,
|
|
|
|
func=locale.format_string, **format_opts)
|
|
|
|
|
|
|
|
def _test_currency(self, value, out, **format_opts):
|
|
|
|
self.assertEqual(locale.currency(value, **format_opts), out)
|
|
|
|
|
|
|
|
|
|
|
|
class EnUSNumberFormatting(BaseFormattingTest):
|
2008-07-26 18:02:53 -03:00
|
|
|
# XXX there is a grouping + padding bug when the thousands separator
|
|
|
|
# is empty but the grouping array contains values (e.g. Solaris 10)
|
2008-07-25 18:45:08 -03:00
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
self.sep = locale.localeconv()['thousands_sep']
|
|
|
|
|
|
|
|
def test_grouping(self):
|
|
|
|
self._test_format("%f", 1024, grouping=1, out='1%s024.000000' % self.sep)
|
|
|
|
self._test_format("%f", 102, grouping=1, out='102.000000')
|
|
|
|
self._test_format("%f", -42, grouping=1, out='-42.000000')
|
|
|
|
self._test_format("%+f", -42, grouping=1, out='-42.000000')
|
|
|
|
|
|
|
|
def test_grouping_and_padding(self):
|
|
|
|
self._test_format("%20.f", -42, grouping=1, out='-42'.rjust(20))
|
2008-07-26 18:02:53 -03:00
|
|
|
if self.sep:
|
|
|
|
self._test_format("%+10.f", -4200, grouping=1,
|
|
|
|
out=('-4%s200' % self.sep).rjust(10))
|
|
|
|
self._test_format("%-10.f", -4200, grouping=1,
|
|
|
|
out=('-4%s200' % self.sep).ljust(10))
|
2008-07-25 18:45:08 -03:00
|
|
|
|
|
|
|
def test_integer_grouping(self):
|
|
|
|
self._test_format("%d", 4200, grouping=True, out='4%s200' % self.sep)
|
|
|
|
self._test_format("%+d", 4200, grouping=True, out='+4%s200' % self.sep)
|
|
|
|
self._test_format("%+d", -4200, grouping=True, out='-4%s200' % self.sep)
|
|
|
|
|
2009-03-13 21:13:13 -03:00
|
|
|
def test_integer_grouping_and_padding(self):
|
|
|
|
self._test_format("%10d", 4200, grouping=True,
|
|
|
|
out=('4%s200' % self.sep).rjust(10))
|
|
|
|
self._test_format("%-10d", -4200, grouping=True,
|
|
|
|
out=('-4%s200' % self.sep).ljust(10))
|
|
|
|
|
2008-07-25 18:45:08 -03:00
|
|
|
def test_simple(self):
|
|
|
|
self._test_format("%f", 1024, grouping=0, out='1024.000000')
|
|
|
|
self._test_format("%f", 102, grouping=0, out='102.000000')
|
|
|
|
self._test_format("%f", -42, grouping=0, out='-42.000000')
|
|
|
|
self._test_format("%+f", -42, grouping=0, out='-42.000000')
|
|
|
|
|
|
|
|
def test_padding(self):
|
|
|
|
self._test_format("%20.f", -42, grouping=0, out='-42'.rjust(20))
|
|
|
|
self._test_format("%+10.f", -4200, grouping=0, out='-4200'.rjust(10))
|
|
|
|
self._test_format("%-10.f", 4200, grouping=0, out='4200'.ljust(10))
|
|
|
|
|
|
|
|
def test_complex_formatting(self):
|
|
|
|
# Spaces in formatting string
|
|
|
|
self._test_format_string("One million is %i", 1000000, grouping=1,
|
|
|
|
out='One million is 1%s000%s000' % (self.sep, self.sep))
|
|
|
|
self._test_format_string("One million is %i", 1000000, grouping=1,
|
|
|
|
out='One million is 1%s000%s000' % (self.sep, self.sep))
|
|
|
|
# Dots in formatting string
|
|
|
|
self._test_format_string(".%f.", 1000.0, out='.1000.000000.')
|
|
|
|
# Padding
|
2008-07-26 18:02:53 -03:00
|
|
|
if self.sep:
|
|
|
|
self._test_format_string("--> %10.2f", 4200, grouping=1,
|
|
|
|
out='--> ' + ('4%s200.00' % self.sep).rjust(10))
|
2008-07-25 18:45:08 -03:00
|
|
|
# Asterisk formats
|
|
|
|
self._test_format_string("%10.*f", (2, 1000), grouping=0,
|
|
|
|
out='1000.00'.rjust(10))
|
2008-07-26 18:02:53 -03:00
|
|
|
if self.sep:
|
|
|
|
self._test_format_string("%*.*f", (10, 2, 1000), grouping=1,
|
|
|
|
out=('1%s000.00' % self.sep).rjust(10))
|
2008-07-25 18:45:08 -03:00
|
|
|
# Test more-in-one
|
2008-07-26 18:02:53 -03:00
|
|
|
if self.sep:
|
|
|
|
self._test_format_string("int %i float %.2f str %s",
|
|
|
|
(1000, 1000.0, 'str'), grouping=1,
|
|
|
|
out='int 1%s000 float 1%s000.00 str str' %
|
|
|
|
(self.sep, self.sep))
|
2008-07-25 18:45:08 -03:00
|
|
|
|
|
|
|
|
2009-04-01 00:42:00 -03:00
|
|
|
class TestFormatPatternArg(unittest.TestCase):
|
|
|
|
# Test handling of pattern argument of format
|
|
|
|
|
|
|
|
def test_onlyOnePattern(self):
|
|
|
|
# Issue 2522: accept exactly one % pattern, and no extra chars.
|
|
|
|
self.assertRaises(ValueError, locale.format, "%f\n", 'foo')
|
|
|
|
self.assertRaises(ValueError, locale.format, "%f\r", 'foo')
|
|
|
|
self.assertRaises(ValueError, locale.format, "%f\r\n", 'foo')
|
|
|
|
self.assertRaises(ValueError, locale.format, " %f", 'foo')
|
|
|
|
self.assertRaises(ValueError, locale.format, "%fg", 'foo')
|
|
|
|
self.assertRaises(ValueError, locale.format, "%^g", 'foo')
|
|
|
|
|
|
|
|
|
2008-07-25 18:45:08 -03:00
|
|
|
class TestNumberFormatting(BaseLocalizedTest, EnUSNumberFormatting):
|
|
|
|
# Test number formatting with a real English locale.
|
|
|
|
|
|
|
|
locale_type = locale.LC_NUMERIC
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
BaseLocalizedTest.setUp(self)
|
|
|
|
EnUSNumberFormatting.setUp(self)
|
|
|
|
|
|
|
|
|
|
|
|
class TestEnUSNumberFormatting(EnUSCookedTest, EnUSNumberFormatting):
|
|
|
|
# Test number formatting with a cooked "en_US" locale.
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
EnUSCookedTest.setUp(self)
|
|
|
|
EnUSNumberFormatting.setUp(self)
|
|
|
|
|
|
|
|
def test_currency(self):
|
|
|
|
self._test_currency(50000, "$50000.00")
|
|
|
|
self._test_currency(50000, "$50,000.00", grouping=True)
|
|
|
|
self._test_currency(50000, "USD 50,000.00",
|
|
|
|
grouping=True, international=True)
|
|
|
|
|
|
|
|
|
|
|
|
class TestCNumberFormatting(CCookedTest, BaseFormattingTest):
|
|
|
|
# Test number formatting with a cooked "C" locale.
|
|
|
|
|
|
|
|
def test_grouping(self):
|
|
|
|
self._test_format("%.2f", 12345.67, grouping=True, out='12345.67')
|
|
|
|
|
|
|
|
def test_grouping_and_padding(self):
|
|
|
|
self._test_format("%9.2f", 12345.67, grouping=True, out=' 12345.67')
|
|
|
|
|
|
|
|
|
2009-03-13 21:13:13 -03:00
|
|
|
class TestFrFRNumberFormatting(FrFRCookedTest, BaseFormattingTest):
|
|
|
|
# Test number formatting with a cooked "fr_FR" locale.
|
|
|
|
|
|
|
|
def test_decimal_point(self):
|
|
|
|
self._test_format("%.2f", 12345.67, out='12345,67')
|
|
|
|
|
|
|
|
def test_grouping(self):
|
|
|
|
self._test_format("%.2f", 345.67, grouping=True, out='345,67')
|
|
|
|
self._test_format("%.2f", 12345.67, grouping=True, out='12 345,67')
|
|
|
|
|
|
|
|
def test_grouping_and_padding(self):
|
|
|
|
self._test_format("%6.2f", 345.67, grouping=True, out='345,67')
|
|
|
|
self._test_format("%7.2f", 345.67, grouping=True, out=' 345,67')
|
|
|
|
self._test_format("%8.2f", 12345.67, grouping=True, out='12 345,67')
|
|
|
|
self._test_format("%9.2f", 12345.67, grouping=True, out='12 345,67')
|
|
|
|
self._test_format("%10.2f", 12345.67, grouping=True, out=' 12 345,67')
|
|
|
|
self._test_format("%-6.2f", 345.67, grouping=True, out='345,67')
|
|
|
|
self._test_format("%-7.2f", 345.67, grouping=True, out='345,67 ')
|
|
|
|
self._test_format("%-8.2f", 12345.67, grouping=True, out='12 345,67')
|
|
|
|
self._test_format("%-9.2f", 12345.67, grouping=True, out='12 345,67')
|
|
|
|
self._test_format("%-10.2f", 12345.67, grouping=True, out='12 345,67 ')
|
|
|
|
|
|
|
|
def test_integer_grouping(self):
|
|
|
|
self._test_format("%d", 200, grouping=True, out='200')
|
|
|
|
self._test_format("%d", 4200, grouping=True, out='4 200')
|
|
|
|
|
|
|
|
def test_integer_grouping_and_padding(self):
|
|
|
|
self._test_format("%4d", 4200, grouping=True, out='4 200')
|
|
|
|
self._test_format("%5d", 4200, grouping=True, out='4 200')
|
|
|
|
self._test_format("%10d", 4200, grouping=True, out='4 200'.rjust(10))
|
|
|
|
self._test_format("%-4d", 4200, grouping=True, out='4 200')
|
|
|
|
self._test_format("%-5d", 4200, grouping=True, out='4 200')
|
|
|
|
self._test_format("%-10d", 4200, grouping=True, out='4 200'.ljust(10))
|
|
|
|
|
|
|
|
def test_currency(self):
|
|
|
|
euro = '\u20ac'
|
|
|
|
self._test_currency(50000, "50000,00 " + euro)
|
|
|
|
self._test_currency(50000, "50 000,00 " + euro, grouping=True)
|
|
|
|
# XXX is the trailing space a bug?
|
|
|
|
self._test_currency(50000, "50 000,00 EUR ",
|
|
|
|
grouping=True, international=True)
|
|
|
|
|
|
|
|
|
2009-10-19 16:47:59 -03:00
|
|
|
class TestCollation(unittest.TestCase):
|
|
|
|
# Test string collation functions
|
|
|
|
|
|
|
|
def test_strcoll(self):
|
|
|
|
self.assertLess(locale.strcoll('a', 'b'), 0)
|
|
|
|
self.assertEqual(locale.strcoll('a', 'a'), 0)
|
|
|
|
self.assertGreater(locale.strcoll('b', 'a'), 0)
|
|
|
|
|
|
|
|
def test_strxfrm(self):
|
|
|
|
self.assertLess(locale.strxfrm('a'), locale.strxfrm('b'))
|
|
|
|
|
|
|
|
|
|
|
|
class TestEnUSCollation(BaseLocalizedTest, TestCollation):
|
|
|
|
# Test string collation functions with a real English locale
|
|
|
|
|
|
|
|
locale_type = locale.LC_ALL
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
BaseLocalizedTest.setUp(self)
|
|
|
|
enc = codecs.lookup(locale.getpreferredencoding(False) or 'ascii').name
|
|
|
|
if enc not in ('utf-8', 'iso8859-1', 'cp1252'):
|
|
|
|
raise unittest.SkipTest('encoding not suitable')
|
|
|
|
if enc != 'iso8859-1' and (sys.platform == 'darwin' or
|
|
|
|
sys.platform.startswith('freebsd')):
|
|
|
|
raise unittest.SkipTest('wcscoll/wcsxfrm have known bugs')
|
|
|
|
|
|
|
|
def test_strcoll_with_diacritic(self):
|
|
|
|
self.assertLess(locale.strcoll('à', 'b'), 0)
|
|
|
|
|
|
|
|
def test_strxfrm_with_diacritic(self):
|
|
|
|
self.assertLess(locale.strxfrm('à'), locale.strxfrm('b'))
|
|
|
|
|
|
|
|
|
2008-07-25 18:45:08 -03:00
|
|
|
class TestMiscellaneous(unittest.TestCase):
|
|
|
|
def test_getpreferredencoding(self):
|
|
|
|
# Invoke getpreferredencoding to make sure it does not cause exceptions.
|
|
|
|
enc = locale.getpreferredencoding()
|
|
|
|
if enc:
|
|
|
|
# If encoding non-empty, make sure it is valid
|
|
|
|
codecs.lookup(enc)
|
|
|
|
|
2009-10-19 16:47:59 -03:00
|
|
|
def test_strcoll_3303(self):
|
|
|
|
# test crasher from bug #3303
|
|
|
|
self.assertRaises(TypeError, locale.strcoll, "a", None)
|
|
|
|
self.assertRaises(TypeError, locale.strcoll, b"a", None)
|
2008-07-25 18:45:08 -03:00
|
|
|
|
|
|
|
|
|
|
|
def test_main():
|
2008-07-26 18:02:53 -03:00
|
|
|
tests = [
|
|
|
|
TestMiscellaneous,
|
2009-04-01 00:42:00 -03:00
|
|
|
TestFormatPatternArg,
|
2008-07-26 18:02:53 -03:00
|
|
|
TestEnUSNumberFormatting,
|
2009-03-13 21:13:13 -03:00
|
|
|
TestCNumberFormatting,
|
|
|
|
TestFrFRNumberFormatting,
|
2009-10-19 16:47:59 -03:00
|
|
|
TestCollation
|
2008-07-26 18:02:53 -03:00
|
|
|
]
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
# SkipTest can't be raised inside unittests, handle it manually instead
|
2008-07-26 18:02:53 -03:00
|
|
|
try:
|
|
|
|
get_enUS_locale()
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
except unittest.SkipTest as e:
|
2008-07-26 18:02:53 -03:00
|
|
|
if verbose:
|
|
|
|
print("Some tests will be disabled: %s" % e)
|
|
|
|
else:
|
2009-10-19 16:47:59 -03:00
|
|
|
tests += [TestNumberFormatting, TestEnUSCollation]
|
2008-07-26 18:02:53 -03:00
|
|
|
run_unittest(*tests)
|
2008-07-25 18:45:08 -03:00
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
test_main()
|