From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 17 Jun 2013 18:40:05 +0000 (+0200)
Subject: Issue #18228: Fix locale test of test.regrtest.saved_test_environment
X-Git-Tag: v3.4.0a1~460
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9ccf7fe22ebd6225e2c436e47ea6d92a8b7404a;p=python

Issue #18228: Fix locale test of test.regrtest.saved_test_environment

Skip LC_ALL becore getlocale(locale.LC_ALL) always fail, and catch also
ValueError.
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index e0ad0d3d3f..4170ad381b 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1231,13 +1231,14 @@ class saved_test_environment:
             elif os.path.isdir(support.TESTFN):
                 shutil.rmtree(support.TESTFN)
 
-    _lc = [getattr(locale, lc) for lc in dir(locale) if lc.startswith('LC_')]
+    _lc = [getattr(locale, lc) for lc in dir(locale)
+           if lc.startswith('LC_') and lc != 'LC_ALL']
     def get_locale(self):
         pairings = []
         for lc in self._lc:
             try:
                 pairings.append((lc, locale.getlocale(lc)))
-            except TypeError:
+            except (TypeError, ValueError):
                 continue
         return pairings
     def restore_locale(self, saved):