Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 05:31:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

5
Lib/test/test_unicodedata.py
View file

@ -186,6 +186,11 @@ def test_normalize(self):
# 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, b'a')

3
Misc/NEWS
View file

@ -100,6 +100,9 @@ Core and Builtins
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.

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;