Fill OSError attributes

dvermd · dvermd · commit 47a3bda10d7c · 2022-10-02T22:49:46.000+02:00
diff --git a/Lib/test/test_exception_hierarchy.py b/Lib/test/test_exception_hierarchy.py
@@ -5,6 +5,7 @@
 import unittest
 import errno
 from errno import EEXIST
+import sys
 
 
 class SubOSError(OSError):
@@ -130,8 +131,8 @@ def test_windows_error(self):
         else:
             self.assertNotIn('winerror', dir(OSError))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
+    @unittest.skip("TODO: RUSTPYTHON")
+    @unittest.skipIf(sys.platform == 'win32', 'winerror not filled yet')
     def test_posix_error(self):
         e = OSError(EEXIST, "File already exists", "foo.txt")
         self.assertEqual(e.errno, EEXIST)
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
@@ -391,8 +391,6 @@ class PyAutoFileTests(AutoFileTests, unittest.TestCase):
     FileIO = _pyio.FileIO
     modulename = '_pyio'
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def testOpendir(self):
         super().testOpendir()
 
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
@@ -1547,8 +1547,6 @@ def test_failed_child_execute_fd_leak(self):
         fds_after_exception = os.listdir(fd_directory)
         self.assertEqual(fds_before_popen, fds_after_exception)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     @unittest.skipIf(mswindows, "behavior currently not supported on Windows")
     def test_file_not_found_includes_filename(self):
         with self.assertRaises(FileNotFoundError) as c:
diff --git a/vm/src/exceptions.rs b/vm/src/exceptions.rs
@@ -1260,7 +1260,7 @@ pub(super) mod types {
         os_error,
         "Base class for I/O related errors.",
         os_error_new,
-        base_exception_init,
+        os_error_init,
     }
     #[cfg(not(target_arch = "wasm32"))]
     fn os_error_optional_new(
@@ -1297,9 +1297,19 @@ pub(super) mod types {
     fn os_error_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
         PyBaseException::slot_new(cls, args, vm)
     }
+    fn os_error_init(zelf: PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> {
+        if args.args.len() >= 3 {
+            zelf.set_attr("filename", args.args[2].clone(), vm)?;
+            if args.args.len() >= 4 {
+                zelf.set_attr("filename2", args.args[args.args.len() - 1].clone(), vm)?;
+            }
+        }
 
-    fn base_exception_init(zelf: PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> {
-        PyBaseException::init(zelf, args, vm)
+        let mut new_args = args;
+        if new_args.args.len() >= 2 {
+            new_args.args.truncate(2);
+        }
+        PyBaseException::init(zelf, new_args, vm)
     }
 
     define_exception! {
