mirror of
https://github.com/python/cpython.git
synced 2025-08-19 00:00:48 +00:00
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! ........
This commit is contained in:
parent
c9b7cc0ffa
commit
bb71dc4396
3 changed files with 9 additions and 1 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue