Index: test__locale.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test__locale.py,v
retrieving revision 1.4
diff -c -c -r1.4 test__locale.py
*** test__locale.py	19 Dec 2003 01:16:03 -0000	1.4
--- test__locale.py	11 Aug 2004 20:57:13 -0000
***************
*** 1,6 ****
  from test.test_support import verbose, TestSkipped
  from _locale import setlocale, LC_NUMERIC, RADIXCHAR, THOUSEP, nl_langinfo
! from _locale import localeconv, Error
  
  candidate_locales = ['es_UY', 'fr_FR', 'fi_FI', 'es_CO', 'pt_PT', 'it_IT',
      'et_EE', 'es_PY', 'no_NO', 'nl_NL', 'lv_LV', 'el_GR', 'be_BY', 'fr_BE',
--- 1,6 ----
  from test.test_support import verbose, TestSkipped
  from _locale import setlocale, LC_NUMERIC, RADIXCHAR, THOUSEP, nl_langinfo
! from _locale import localeconv, Error, LC_ALL
  
  candidate_locales = ['es_UY', 'fr_FR', 'fi_FI', 'es_CO', 'pt_PT', 'it_IT',
      'et_EE', 'es_PY', 'no_NO', 'nl_NL', 'lv_LV', 'el_GR', 'be_BY', 'fr_BE',
***************
*** 13,18 ****
--- 13,19 ----
      'eu_ES', 'vi_VN', 'af_ZA', 'nb_NO', 'en_DK', 'tg_TJ',
      'es_ES.ISO8859-1', 'fr_FR.ISO8859-15', 'ru_RU.KOI8-R', 'ko_KR.eucKR']
  
+ initial_locale = setlocale(LC_ALL)
  saw_locale = 0
  for loc in candidate_locales:
      try:
***************
*** 32,34 ****
--- 33,37 ----
          print "%r != %r" % (nl_radixchar, li_radixchar)
  if not saw_locale:
      raise ImportError, "None of the listed locales found"
+ setlocale(LC_ALL, initial_locale)
+