[Python-checkins] r46035 - python/trunk/Lib/test/test_locale.py

[georg.brandl]

Author: georg.brandl
Date: Thu May 18 08:33:27 2006
New Revision: 46035

Modified:
   python/trunk/Lib/test/test_locale.py
Log:
Fix test_locale for platforms without a default thousands separator.



Modified: python/trunk/Lib/test/test_locale.py
==============================================================================
--- python/trunk/Lib/test/test_locale.py	(original)
+++ python/trunk/Lib/test/test_locale.py	Thu May 18 08:33:27 2006
@@ -52,23 +52,26 @@
 
     # === Test format() with more complex formatting strings
     # test if grouping is independent from other characters in formatting string
-    testformat("One million is %i", 1000000, grouping=1, output='One million is 1,000,000',
+    testformat("One million is %i", 1000000, grouping=1,
+               output='One million is 1%s000%s000' % (sep, sep),
                func=locale.format_string)
-    testformat("One  million is %i", 1000000, grouping=1, output='One  million is 1,000,000',
+    testformat("One  million is %i", 1000000, grouping=1,
+               output='One  million is 1%s000%s000' % (sep, sep),
                func=locale.format_string)
     # test dots in formatting string
     testformat(".%f.", 1000.0, output='.1000.000000.', func=locale.format_string)
     # test floats
-    testformat("--> %10.2f", 1000.0, grouping=1, output='-->   1,000.00',
+    testformat("--> %10.2f", 1000.0, grouping=1, output='-->   1%s000.00' % sep,
                func=locale.format_string)
     # test asterisk formats
     testformat("%10.*f", (2, 1000.0), grouping=0, output='   1000.00',
                func=locale.format_string)
-    testformat("%*.*f", (10, 2, 1000.0), grouping=1, output='  1,000.00',
+    testformat("%*.*f", (10, 2, 1000.0), grouping=1, output='  1%s000.00' % sep,
                func=locale.format_string)
     # test more-in-one
     testformat("int %i float %.2f str %s", (1000, 1000.0, 'str'), grouping=1,
-               output='int 1,000 float 1,000.00 str str', func=locale.format_string)
+               output='int 1%s000 float 1%s000.00 str str' % (sep, sep),
+               func=locale.format_string)
 
 finally:
     locale.setlocale(locale.LC_NUMERIC, oldlocale)