diff options
author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-21 13:41:15 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-21 13:41:15 (GMT) |
commit | bb71dc4396c8147feaa94eca62ac1c4c5d13d5ce (patch) | |
tree | 201eef2751c40c1032cebe16c15a7b23d5e66e4a /Modules | |
parent | c9b7cc0ffa412331d4ffc1ccd4ac06aa93af68e9 (diff) | |
download | cpython-bb71dc4396c8147feaa94eca62ac1c4c5d13d5ce.zip cpython-bb71dc4396c8147feaa94eca62ac1c4c5d13d5ce.tar.gz cpython-bb71dc4396c8147feaa94eca62ac1c4c5d13d5ce.tar.bz2 |
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!
........
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/unicodedata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c index ad77651..0e61877 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -681,7 +681,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; |