RustPython · youknowone · Feb 24, 2025 · Feb 23, 2025 · Feb 24, 2025 · Feb 24, 2025
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -23,7 +23,6 @@ env:
  # test_os: many failing tests
  # test_pathlib: support.rmtree() failing
  # test_posixpath: OSError: (22, 'The filename, directory name, or volume label syntax is incorrect. (os error 123)')
-  # test_unicode: AttributeError: module '_winapi' has no attribute 'GetACP'
  # test_venv: couple of failing tests
  WINDOWS_SKIPS: >-
    test_argparse
@@ -33,7 +32,6 @@ env:
    test_rlcompleter
    test_pathlib
    test_posixpath
-    test_unicode
    test_venv
  # configparser: https://github.com/RustPython/RustPython/issues/4995#issuecomment-1582397417
  # socketserver: seems related to configparser crash.

diff --git a/Lib/test/test_charmapcodec.py b/Lib/test/test_charmapcodec.py
@@ -26,7 +26,6 @@ def codec_search_function(encoding):
 codecname = 'testcodec'

 class CharmapCodecTest(unittest.TestCase):
-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_constructorx(self):
        self.assertEqual(str(b'abc', codecname), 'abc')
        self.assertEqual(str(b'xdef', codecname), 'abcdef')
@@ -43,14 +42,12 @@ def test_encodex(self):
        self.assertEqual('dxf'.encode(codecname), b'dabcf')
        self.assertEqual('dxfx'.encode(codecname), b'dabcfabc')

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_constructory(self):
        self.assertEqual(str(b'ydef', codecname), 'def')
        self.assertEqual(str(b'defy', codecname), 'def')
        self.assertEqual(str(b'dyf', codecname), 'df')
        self.assertEqual(str(b'dyfy', codecname), 'df')

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_maptoundefined(self):
        self.assertRaises(UnicodeError, str, b'abc\001', codecname)


diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
@@ -1827,7 +1827,6 @@ def test_decode(self):
        self.assertEqual(codecs.decode(b'[\xff]', 'ascii', errors='ignore'),
                         '[]')

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_encode(self):
        self.assertEqual(codecs.encode('\xe4\xf6\xfc', 'latin-1'),
                         b'\xe4\xf6\xfc')
@@ -1846,7 +1845,6 @@ def test_register(self):
        self.assertRaises(TypeError, codecs.register)
        self.assertRaises(TypeError, codecs.register, 42)

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON; AttributeError: module '_winapi' has no attribute 'GetACP'")
    def test_unregister(self):
        name = "nonexistent_codec_name"
        search_function = mock.Mock()
@@ -1859,28 +1857,23 @@ def test_unregister(self):
        self.assertRaises(LookupError, codecs.lookup, name)
        search_function.assert_not_called()

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_lookup(self):
        self.assertRaises(TypeError, codecs.lookup)
        self.assertRaises(LookupError, codecs.lookup, "__spam__")
        self.assertRaises(LookupError, codecs.lookup, " ")

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_getencoder(self):
        self.assertRaises(TypeError, codecs.getencoder)
        self.assertRaises(LookupError, codecs.getencoder, "__spam__")

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_getdecoder(self):
        self.assertRaises(TypeError, codecs.getdecoder)
        self.assertRaises(LookupError, codecs.getdecoder, "__spam__")

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_getreader(self):
        self.assertRaises(TypeError, codecs.getreader)
        self.assertRaises(LookupError, codecs.getreader, "__spam__")

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_getwriter(self):
        self.assertRaises(TypeError, codecs.getwriter)
        self.assertRaises(LookupError, codecs.getwriter, "__spam__")
@@ -1939,7 +1932,6 @@ def test_undefined(self):
            self.assertRaises(UnicodeError,
                codecs.decode, b'abc', 'undefined', errors)

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_file_closes_if_lookup_error_raised(self):
        mock_open = mock.mock_open()
        with mock.patch('builtins.open', mock_open) as file:
@@ -3287,7 +3279,6 @@ def test_multiple_args(self):
        self.check_note(RuntimeError('a', 'b', 'c'), msg_re)

    # http://bugs.python.org/issue19609
-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_codec_lookup_failure(self):
        msg = "^unknown encoding: {}$".format(self.codec_name)
        with self.assertRaisesRegex(LookupError, msg):
@@ -3523,8 +3514,6 @@ def test_incremental(self):
                                          False)
        self.assertEqual(decoded, ('abc', 3))

-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
    def test_mbcs_alias(self):
        # Check that looking up our 'default' codepage will return
        # mbcs when we don't have a more specific one available

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
@@ -1237,7 +1237,6 @@ def test_utf8_normalization(self):
                found, consumed_lines = detect_encoding(rl)
                self.assertEqual(found, "utf-8")

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_short_files(self):
        readline = self.get_readline((b'print(something)\n',))
        encoding, consumed_lines = detect_encoding(readline)
@@ -1316,7 +1315,6 @@ def readline(self):
            ins = Bunk(lines, path)
            detect_encoding(ins.readline)

-    @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON")
    def test_open_error(self):
        # Issue #23840: open() must close the binary file on error
        m = BytesIO(b'#coding:xxx')

diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -125,6 +125,7 @@ features = [
 workspace = true
 features = [
  "Win32_Foundation",
+  "Win32_Globalization",
  "Win32_Networking_WinSock",
  "Win32_Security",
  "Win32_Storage_FileSystem",

diff --git a/vm/src/stdlib/winapi.rs b/vm/src/stdlib/winapi.rs
@@ -119,6 +119,11 @@ mod _winapi {
        Ok(HANDLE(target))
    }

+    #[pyfunction]
+    fn GetACP() -> u32 {
+        unsafe { windows_sys::Win32::Globalization::GetACP() }
+    }
+
    #[pyfunction]
    fn GetCurrentProcess() -> HANDLE {
        unsafe { windows::Win32::System::Threading::GetCurrentProcess() }