From 15d6b65ead4bc2cce509fe16decce311f1f1bd71 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Mon, 15 Aug 2011 09:22:24 +0300 Subject: #12266: Fix str.capitalize() to correctly uppercase/lowercase titlecased and cased non-letter characters. --- Lib/test/string_tests.py | 17 +++++++++++++++++ Misc/NEWS | 3 +++ Objects/unicodeobject.c | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index 5931f3d..9cf3345 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -96,6 +96,23 @@ class CommonTest(unittest.TestCase): self.checkequal('Aaaa', 'aaaa', 'capitalize') self.checkequal('Aaaa', 'AaAa', 'capitalize') + # check that titlecased chars are lowered correctly + # \u1ffc is the titlecased char + self.checkequal(u'\u1ffc\u1ff3\u1ff3\u1ff3', + u'\u1ff3\u1ff3\u1ffc\u1ffc', 'capitalize') + # check with cased non-letter chars + self.checkequal(u'\u24c5\u24e8\u24e3\u24d7\u24de\u24dd', + u'\u24c5\u24ce\u24c9\u24bd\u24c4\u24c3', 'capitalize') + self.checkequal(u'\u24c5\u24e8\u24e3\u24d7\u24de\u24dd', + u'\u24df\u24e8\u24e3\u24d7\u24de\u24dd', 'capitalize') + self.checkequal(u'\u2160\u2171\u2172', + u'\u2160\u2161\u2162', 'capitalize') + self.checkequal(u'\u2160\u2171\u2172', + u'\u2170\u2171\u2172', 'capitalize') + # check with Ll chars with no upper - nothing changes here + self.checkequal(u'\u019b\u1d00\u1d86\u0221\u1fb7', + u'\u019b\u1d00\u1d86\u0221\u1fb7', 'capitalize') + self.checkraises(TypeError, 'hello', 'capitalize', 42) def test_count(self): diff --git a/Misc/NEWS b/Misc/NEWS index 585a56c..497e3d4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -9,6 +9,9 @@ What's New in Python 2.7.3? Core and Builtins ----------------- +- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase + titlecased and cased non-letter characters. + - Issues #12610 and #12609: Verify that user generated AST has correct string and identifier types before compiling. diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index af259a0..4d6864d 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -5485,13 +5485,13 @@ int fixcapitalize(PyUnicodeObject *self) if (len == 0) return 0; - if (Py_UNICODE_ISLOWER(*s)) { + if (!Py_UNICODE_ISUPPER(*s)) { *s = Py_UNICODE_TOUPPER(*s); status = 1; } s++; while (--len > 0) { - if (Py_UNICODE_ISUPPER(*s)) { + if (!Py_UNICODE_ISLOWER(*s)) { *s = Py_UNICODE_TOLOWER(*s); status = 1; } -- cgit v0.12