commit a9d157a8dd7a5b2b53b60680729c320f9fd9f96c
author Victor Stinner <victor.stinner@haypocalc.com> Thu Mar 04 12:16:27 2010 +0000
committer Victor Stinner <victor.stinner@haypocalc.com> Thu Mar 04 12:16:27 2010 +0000
tree 6b6071465b5d663f1b3f3f6faf552783f0ad3f28
parent da13545ebec915c8f22bade82400df12639bc324

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!
  ........
................

Modules/unicodedata.c

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