[Python-checkins] r79201 - in python/branches/release26-maint: Lib/test/test_unicodedata.py Misc/NEWS Modules/unicodedata.c

Sun Mar 21 14:41:15 CET 2010

Author: victor.stinner
Date: Sun Mar 21 14:41:15 2010
New Revision: 79201
Log:
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!
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/test/test_unicodedata.py
 python/branches/release26-maint/Misc/NEWS
 python/branches/release26-maint/Modules/unicodedata.c
Modified: python/branches/release26-maint/Lib/test/test_unicodedata.py
==============================================================================

--- python/branches/release26-maint/Lib/test/test_unicodedata.py	(original)
+++ python/branches/release26-maint/Lib/test/test_unicodedata.py	Sun Mar 21 14:41:15 2010
@@ -185,6 +185,11 @@
 # 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, 'a')
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Mar 21 14:41:15 2010
@@ -21,6 +21,9 @@
 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.
 
Modified: python/branches/release26-maint/Modules/unicodedata.c
==============================================================================
--- python/branches/release26-maint/Modules/unicodedata.c	(original)
+++ python/branches/release26-maint/Modules/unicodedata.c	Sun Mar 21 14:41:15 2010
@@ -681,7 +681,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;
