[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #24299: Fixed test__locale on Solaris.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/0a1f1988fece
changeset:   96545:0a1f1988fece
branch:      3.5
parent:      96541:fb05c1355a90
parent:      96544:da642b5aaf79
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Mon Jun 08 18:50:18 2015 +0300
summary:
  Issue #24299: Fixed test__locale on Solaris.

files:
  Lib/test/test__locale.py |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test__locale.py b/Lib/test/test__locale.py
--- a/Lib/test/test__locale.py
+++ b/Lib/test/test__locale.py
@@ -24,7 +24,8 @@
     'de_DE', 'sr_YU', 'br_FR', 'nl_BE', 'sv_FI', 'pl_PL', 'fr_CA', 'fo_FO',
     'bs_BA', 'fr_LU', 'kl_GL', 'fa_IR', 'de_BE', 'sv_SE', 'it_CH', 'uk_UA',
     'eu_ES', 'vi_VN', 'af_ZA', 'nb_NO', 'en_DK', 'tg_TJ', 'ps_AF', 'en_US',
-    'es_ES.ISO8859-1', 'fr_FR.ISO8859-15', 'ru_RU.KOI8-R', 'ko_KR.eucKR']
+    'fr_FR.ISO8859-1', 'fr_FR.UTF-8', 'fr_FR.ISO8859-15 at euro',
+    'ru_RU.KOI8-R', 'ko_KR.eucKR']
 
 def setUpModule():
     global candidate_locales
@@ -65,8 +66,8 @@
 # value is not known, use '' .
 known_numerics = {
     'en_US': ('.', ','),
-    'fr_FR' : (',', ' '),
     'de_DE' : (',', '.'),
+    'fr_FR.UTF-8' : (',', ' '),
     'ps_AF': ('\u066b', '\u066c'),
 }
 

-- 
Repository URL: https://hg.python.org/cpython