Issue #1813: Fix codec lookup under Turkish locales.

pitrou · pitrou · commit cf9d3c08c85e · 2011-07-24T02:27:04.000+02:00
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
@@ -1,6 +1,7 @@
 from test import support
 import unittest
 import codecs
+import locale
 import sys, _testcapi, io
 
 class Queue(object):
@@ -1230,6 +1231,19 @@ def test_getwriter(self):
         self.assertRaises(TypeError, codecs.getwriter)
         self.assertRaises(LookupError, codecs.getwriter, "__spam__")
 
+    def test_lookup_issue1813(self):
+        # Issue #1813: under Turkish locales, lookup of some codecs failed
+        # because 'I' is lowercased as "ı" (dotless i)
+        oldlocale = locale.getlocale(locale.LC_CTYPE)
+        self.addCleanup(locale.setlocale, locale.LC_CTYPE, oldlocale)
+        try:
+            locale.setlocale(locale.LC_CTYPE, 'tr_TR')
+        except locale.Error:
+            # Unsupported locale on this system
+            self.skipTest('test needs Turkish locale')
+        c = codecs.lookup('ASCII')
+        self.assertEqual(c.name, 'ascii')
+
 class StreamReaderTest(unittest.TestCase):
 
     def setUp(self):
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -37,6 +37,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #1813: Fix codec lookup under Turkish locales.
+
 - Issue #12591: Improve support of "universal newlines" in the subprocess
   module: the piped streams can now be properly read from or written to.
 
diff --git a/Python/codecs.c b/Python/codecs.c
@@ -69,7 +69,7 @@ PyObject *normalizestring(const char *string)
         if (ch == ' ')
             ch = '-';
         else
-            ch = tolower(Py_CHARMASK(ch));
+            ch = Py_TOLOWER(Py_CHARMASK(ch));
         p[i] = ch;
     }
     p[i] = '\0';

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ PyObject normalizestring(const char string)`
`69`	`69`	`if (ch == ' ')`
`70`	`70`	`ch = '-';`
`71`	`71`	`else`
`72`		`- ch = tolower(Py_CHARMASK(ch));`
	`72`	`+ ch = Py_TOLOWER(Py_CHARMASK(ch));`
`73`	`73`	`p[i] = ch;`
`74`	`74`	`}`
`75`	`75`	`p[i] = '\0';`