summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-12-01 21:59:18 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-12-01 21:59:18 (GMT)
commit64f3ca4206ebcb4b3166e0cd8fe0658628b04b4e (patch)
tree12004dc09fe16057d8b3845a273566b379112365 /Lib
parentc2e1cb7d36ad387a06c6b7dadf30c6535f086280 (diff)
downloadcpython-64f3ca4206ebcb4b3166e0cd8fe0658628b04b4e.zip
cpython-64f3ca4206ebcb4b3166e0cd8fe0658628b04b4e.tar.gz
cpython-64f3ca4206ebcb4b3166e0cd8fe0658628b04b4e.tar.bz2
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. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_locale.py11
1 files changed, 11 insertions, 0 deletions
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 @@ class TestMiscellaneous(unittest.TestCase):
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 = [