commit ea315ac8f4890538ad23c5247c2cc7dfa7e9f985
author Amaury Forgeot d'Arc <amauryfa@gmail.com> Tue Dec 01 22:03:44 2009 +0000
committer Amaury Forgeot d'Arc <amauryfa@gmail.com> Tue Dec 01 22:03:44 2009 +0000
tree 1998254f0bcbed54e4a26f8d876dc3579db0e30c
parent 6c8ee7a33309b79d9f2737616501835349cfcdaf

Merged revisions 76626 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76626 | amaury.forgeotdarc | 2009-12-01 22:59:18 +0100 (mar., 01 déc. 2009) | 10 lines

  Merged revisions 76625 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76625 | amaury.forgeotdarc | 2009-12-01 22:51:04 +0100 (mar., 01 déc. 2009) | 3 lines

    #7419: Fix a crash on Windows in locale.setlocale() when the category
    is outside the allowed range.
  ........
................

Lib/test/test_locale.py

diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index 8dfaf90..8c17f87 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -353,6 +353,17 @@
         self.assertRaises(TypeError, locale.strcoll, "a", None)
         self.assertRaises(TypeError, locale.strcoll, b"a", None)
 
+    def test_setlocale_category(self):
+        locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_TIME)
+        locale.setlocale(locale.LC_CTYPE)
+        locale.setlocale(locale.LC_COLLATE)
+        locale.setlocale(locale.LC_MONETARY)
+        locale.setlocale(locale.LC_NUMERIC)
+
+        # crasher from bug #7419
+        self.assertRaises(locale.Error, locale.setlocale, 12345)
+
 
 def test_main():
     tests = [