Merged revisions 87442 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87442 | alexander.belopolsky | 2010-12-22 21:27:37 -0500 (Wed, 22 Dec 2010) | 1 line

  Issue #10254: Fixed a crash and a regression introduced by the implementation of PRI 29.
........
This commit is contained in:
Alexander Belopolsky 2010-12-28 15:47:56 +00:00
parent 5360d003b6
commit dce6cf353c
3 changed files with 23 additions and 8 deletions

View File

@ -53,9 +53,6 @@ class NormalizationTest(unittest.TestCase):
if line.startswith("@Part"):
part = line.split()[0]
continue
if part == "@Part3":
# XXX we don't support PRI #29 yet, so skip these tests for now
continue
try:
c1,c2,c3,c4,c5 = [unistr(x) for x in line.split(';')[:-1]]
except RangeError:

View File

@ -188,9 +188,22 @@ class UnicodeFunctionsTest(UnicodeDatabaseTest):
def test_pr29(self):
# http://www.unicode.org/review/pr-29.html
for text in (u"\u0b47\u0300\u0b3e", u"\u1100\u0300\u1161"):
# See issues #1054943 and #10254.
composed = (u"\u0b47\u0300\u0b3e", u"\u1100\u0300\u1161",
u'Li\u030dt-s\u1e73\u0301',
u'\u092e\u093e\u0930\u094d\u0915 \u091c\u093c'
+ u'\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917',
u'\u0915\u093f\u0930\u094d\u0917\u093f\u091c\u093c'
+ 'u\u0938\u094d\u0924\u093e\u0928')
for text in composed:
self.assertEqual(self.db.normalize('NFC', text), text)
def test_issue10254(self):
# Crash reported in #10254
a = u'C\u0338' * 20 + 'C\u0327'
b = u'C\u0338' * 20 + '\xC7'
self.assertEqual(self.db.normalize('NFC', a), b)
def test_east_asian_width(self):
eaw = self.db.east_asian_width
self.assertRaises(TypeError, eaw, 'a')

View File

@ -682,10 +682,14 @@ nfc_nfkc(PyObject *self, PyObject *input, int k)
comb = 0;
while (i1 < end) {
int comb1 = _getrecord_ex(*i1)->combining;
if (comb && (comb1 == 0 || comb == comb1)) {
/* Character is blocked. */
i1++;
continue;
if (comb) {
if (comb1 == 0)
break;
if (comb >= comb1) {
/* Character is blocked. */
i1++;
continue;
}
}
l = find_nfc_index(self, nfc_last, *i1);
/* *i1 cannot be combined with *i. If *i1
@ -709,6 +713,7 @@ nfc_nfkc(PyObject *self, PyObject *input, int k)
/* Replace the original character. */
*i = code;
/* Mark the second character unused. */
assert(cskipped < 20);
skipped[cskipped++] = i1;
i1++;
f = find_nfc_index(self, nfc_first, *i);