mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Merged revisions 78647 via svnmerge from

Browse source 
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!
  ........
................
This commit is contained in:
Victor Stinner 2010-03-04 12:16:27 +00:00
parent da13545ebe
commit a9d157a8dd
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/unicodedata.c
View file

@ -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;