diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-04 12:16:27 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-04 12:16:27 (GMT) |
| commit | a9d157a8dd7a5b2b53b60680729c320f9fd9f96c (patch) | |
| tree | 6b6071465b5d663f1b3f3f6faf552783f0ad3f28 | |
| parent | da13545ebec915c8f22bade82400df12639bc324 (diff) | |
| download | cpython-a9d157a8dd7a5b2b53b60680729c320f9fd9f96c.zip cpython-a9d157a8dd7a5b2b53b60680729c320f9fd9f96c.tar.gz cpython-a9d157a8dd7a5b2b53b60680729c320f9fd9f96c.tar.bz2 | |
Merged revisions 78647 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r78647 | victor.stinner | 2010-03-04 13:14:57 +0100 (jeu., 04 mars 2010) | 12 lines
Merged revisions 78646 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78646 | victor.stinner | 2010-03-04 13:09:33 +0100 (jeu., 04 mars 2010) | 5 lines
Issue #1054943: Fix unicodedata.normalize('NFC', text) for the Public Review
Issue #29.
PR #29 was released in february 2004!
........
................
| -rw-r--r-- | Lib/test/test_unicodedata.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/unicodedata.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Lib/test/test_unicodedata.py b/Lib/test/test_unicodedata.py index a658d7b..0f3fec8 100644 --- a/Lib/test/test_unicodedata.py +++ b/Lib/test/test_unicodedata.py @@ -186,6 +186,11 @@ class UnicodeFunctionsTest(UnicodeDatabaseTest): # The rest can be found in test_normalization.py # which requires an external file. + def test_pr29(self): + # http://www.unicode.org/review/pr-29.html + for text in (u"\u0b47\u0300\u0b3e", u"\u1100\u0300\u1161"): + self.assertEqual(self.db.normalize('NFC', text), text) + def test_east_asian_width(self): eaw = self.db.east_asian_width self.assertRaises(TypeError, eaw, b'a') @@ -100,6 +100,9 @@ Core and Builtins Library ------- +- Issue #1054943: Fix unicodedata.normalize('NFC', text) for the Public Review + Issue #29 + - Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler, reset also the pointer to the current pointer context. diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c index 2dddc48..f7c3292 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -684,7 +684,7 @@ nfc_nfkc(PyObject *self, PyObject *input, int k) comb = 0; while (i1 < end) { int comb1 = _getrecord_ex(*i1)->combining; - if (comb1 && comb == comb1) { + if (comb && (comb1 == 0 || comb == comb1)) { /* Character is blocked. */ i1++; continue; |