Skip to content

Fix most of unicodedata, unmask multiple tests, and remove ucd #7947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
joshuamegnauth54 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix most of unicodedata, unmask multiple tests, and remove ucd #7947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 0 additions & 49 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,6 @@ icu_locale = "2"
icu_properties = "2"
icu_normalizer = "2"
uuid = "1.23.1"
ucd = "0.1.1"
unic-ucd-age = "0.9.0"
unicode_names2 = "2.0.0"
widestring = "1.2.0"
windows-sys = "0.61.2"
Expand Down
1 change: 0 additions & 1 deletion Lib/test/test_str.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,6 @@ def test_isprintable(self):
self.assertTrue('\U0001F46F'.isprintable())
self.assertFalse('\U000E0020'.isprintable())

@unittest.expectedFailure # TODO: RUSTPYTHON

@ShaharNaveh ShaharNaveh May 21, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<3

@support.requires_resource('cpu')
def test_isprintable_invariant(self):
for codepoint in range(sys.maxunicode + 1):
Expand Down
13 changes: 1 addition & 12 deletions Lib/test/test_unicodedata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ def test_function_checksum(self):
result = h.hexdigest()
self.assertEqual(result, self.expectedchecksum)

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: None != 'EGYPTIAN HIEROGLYPH-13460'
def test_name(self):
name = self.db.name
self.assertRaises(ValueError, name, '\0')
Expand Down Expand Up @@ -207,7 +206,6 @@ def test_lookup_nonexistant(self):
]:
self.assertRaises(KeyError, self.db.lookup, nonexistent)

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: None != 9
def test_digit(self):
self.assertEqual(self.db.digit('A', None), None)
self.assertEqual(self.db.digit('9'), 9)
Expand All @@ -227,7 +225,6 @@ def test_digit(self):
self.assertRaises(TypeError, self.db.digit, 'xx')
self.assertRaises(ValueError, self.db.digit, 'x')

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_numeric(self):
self.assertEqual(self.db.numeric('A',None), None)
self.assertEqual(self.db.numeric('9'), 9)
Expand Down Expand Up @@ -260,7 +257,6 @@ def test_numeric(self):
self.assertRaises(TypeError, self.db.numeric, 'xx')
self.assertRaises(ValueError, self.db.numeric, 'x')

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: None != 2
def test_decimal(self):
self.assertEqual(self.db.decimal('A',None), None)
self.assertEqual(self.db.decimal('9'), 9)
Expand All @@ -285,7 +281,6 @@ def test_decimal(self):
self.assertRaises(TypeError, self.db.decimal, 'xx')
self.assertRaises(ValueError, self.db.decimal, 'x')

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 'Cn' != 'Mn'
def test_category(self):
self.assertEqual(self.db.category('\uFFFE'), 'Cn')
self.assertEqual(self.db.category('a'), 'Ll')
Expand Down Expand Up @@ -365,7 +360,6 @@ def test_decomposition(self):
self.assertRaises(TypeError, self.db.decomposition)
self.assertRaises(TypeError, self.db.decomposition, 'xx')

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 1 != 0
def test_mirrored(self):
self.assertEqual(self.db.mirrored('\uFFFE'), 0)
self.assertEqual(self.db.mirrored('a'), 0)
Expand All @@ -385,7 +379,6 @@ def test_mirrored(self):
self.assertRaises(TypeError, self.db.mirrored)
self.assertRaises(TypeError, self.db.mirrored, 'xx')

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 0 != 220
def test_combining(self):
self.assertEqual(self.db.combining('\uFFFE'), 0)
self.assertEqual(self.db.combining('a'), 0)
Expand Down Expand Up @@ -605,7 +598,6 @@ def test_issue29456(self):
self.assertEqual(self.db.normalize('NFC', u11a7_str_a), u11a7_str_b)
self.assertEqual(self.db.normalize('NFC', u11c3_str_a), u11c3_str_b)

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 'W' != 'N'
def test_east_asian_width(self):
eaw = self.db.east_asian_width
self.assertRaises(TypeError, eaw, b'a')
Expand Down Expand Up @@ -646,7 +638,6 @@ def test_east_asian_width(self):
self.assertEqual(eaw('\u2630'), 'N' if self.old else 'W')
self.assertEqual(eaw('\U0001FAE9'), 'N' if self.old else 'W')

@unittest.expectedFailure # TODO: RUSTPYTHON; + W
def test_east_asian_width_unassigned(self):
eaw = self.db.east_asian_width
# unassigned
Expand Down Expand Up @@ -685,7 +676,7 @@ def test_normalization(self):
def test_combining(self):
return super().test_combining()

@unittest.expectedSuccess # TODO: RUSTPYTHON
@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 'LATIN SMALL LETTER D WITH CURL' != None
def test_name(self):
return super().test_name()

Expand Down Expand Up @@ -753,7 +744,6 @@ def test_normalize_consistent(self):
def test_bug_1704793(self):
self.assertEqual(self.db.lookup("GOTHIC LETTER FAIHU"), '\U00010346')

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: False is not true
def test_ucd_510(self):
# In UCD 5.1.0, a mirrored property changed wrt. UCD 3.2.0
self.assertTrue(unicodedata.mirrored("\u0f3a"))
Expand Down Expand Up @@ -805,7 +795,6 @@ def unistr(data):
data = [int(x, 16) for x in data.split(" ")]
return "".join([chr(x) for x in data])

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: False is not true : 13055
@requires_resource('network')
@requires_resource('cpu')
def test_normalization(self):
Expand Down
5 changes: 3 additions & 2 deletions crates/stdlib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ unicode_names2 = { workspace = true }
# update version all at the same time
icu_properties = { workspace = true }
icu_normalizer = { workspace = true }
unic-ucd-age = { workspace = true }
ucd = { workspace = true }

# compression
adler32 = { workspace = true }
Expand Down Expand Up @@ -143,6 +141,9 @@ system-configuration = { workspace = true }
insta = { workspace = true }
rustpython-pylib = { workspace = true, features = [ "freeze-stdlib" ] }

[build-dependencies]
icu_normalizer = { workspace = true }
icu_properties = { workspace = true }

[lints]
workspace = true
Loading