Skip to content

Commit 3e0322f

Browse files
authored
gh-84424: Use numeric_changed for UCD.numeric (GH-19457)
This was causing ucd_3_2_0.numeric() to pick up only decimal changes between Unicode 3.2.0 and the current version.
1 parent c6e418d commit 3e0322f

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Lib/test/test_unicodedata.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,14 @@ def test_numeric(self):
182182

183183
# New in 4.1.0
184184
self.assertEqual(self.db.numeric('\U0001012A', None), None if self.old else 9000)
185+
# Changed in 4.1.0
186+
self.assertEqual(self.db.numeric('\u5793', None), 1e20 if self.old else None)
185187
# New in 5.0.0
186188
self.assertEqual(self.db.numeric('\u07c0', None), None if self.old else 0.0)
187189
# New in 5.1.0
188190
self.assertEqual(self.db.numeric('\ua627', None), None if self.old else 7.0)
191+
# Changed in 5.2.0
192+
self.assertEqual(self.db.numeric('\u09f6'), 3.0 if self.old else 3/16)
189193
# New in 6.0.0
190194
self.assertEqual(self.db.numeric('\u0b72', None), None if self.old else 0.25)
191195
# New in 12.0.0
@@ -857,9 +861,9 @@ def graphemes(*args):
857861
class Unicode_3_2_0_FunctionsTest(unittest.TestCase, BaseUnicodeFunctionsTest):
858862
db = unicodedata.ucd_3_2_0
859863
old = True
860-
expectedchecksum = ('f4526159891a4b766dd48045646547178737ba09'
864+
expectedchecksum = ('4154d8d1232837e255edf3cdcbb5ab184d71f4a4'
861865
if quicktest else
862-
'f217b8688d7bdff31db4207e078a96702f091597')
866+
'3aabaf66823b21b3d305dad804a62f6f6387c93e')
863867

864868

865869
class UnicodeMiscTest(unittest.TestCase):
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix :meth:`!unicodedata.ucd_3_2_0.numeric` for non-decimal values.

Modules/unicodedata.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,9 @@ unicodedata_UCD_numeric_impl(PyObject *self, int chr,
270270
have_old = 1;
271271
rc = -1.0;
272272
}
273-
else if (old->decimal_changed != 0xFF) {
273+
else if (old->numeric_changed != 0.0) {
274274
have_old = 1;
275-
rc = old->decimal_changed;
275+
rc = old->numeric_changed;
276276
}
277277
}
278278

0 commit comments

Comments
 (0)