os: fix spawnv tests

yossi-k · yossi-k · commit c1de78058d90 · 2021-07-26T15:38:40.000+03:00
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
@@ -2734,13 +2734,9 @@ def check_waitpid(self, code, exitcode):
             self.assertEqual(os.WEXITSTATUS(status), exitcode)
         self.assertEqual(pid2, pid)
 
-    # TODO: RUSTPYTHON (AttributeError: module 'os' has no attribute 'spawnv')
-    @unittest.expectedFailure
     def test_waitpid(self):
         self.check_waitpid(code='pass', exitcode=0)
 
-    # TODO: RUSTPYTHON (AttributeError: module 'os' has no attribute 'spawnv')
-    @unittest.expectedFailure
     def test_waitpid_exitcode(self):
         exitcode = 23
         code = f'import sys; sys.exit({exitcode})'
diff --git a/vm/src/byteslike.rs b/vm/src/byteslike.rs
@@ -1,6 +1,8 @@
+use std::ffi;
 use crate::builtins::memory::{try_buffer_from_object, BufferRef};
 use crate::builtins::PyStrRef;
 use crate::common::borrow::{BorrowedValue, BorrowedValueMut};
+use crate::exceptions::IntoPyException;
 use crate::vm::VirtualMachine;
 use crate::{PyObjectRef, PyResult, TryFromObject};
 
@@ -145,4 +147,9 @@ impl BufOrStr {
             Self::Str(s) => s.as_str().as_bytes().into(),
         }
     }
+
+    pub fn to_cstring(&self, vm: &VirtualMachine) -> PyResult<ffi::CString> {
+        ffi::CString::new(self.borrow_bytes().to_vec()).map_err(|err| err.into_pyexception(vm))
+    }
+
 }
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -2018,6 +2018,7 @@ mod posix {
 
     use crate::builtins::dict::PyMapping;
     use crate::builtins::list::PyListRef;
+    use crate::byteslike::BufOrStr;
     use crate::PyIterable;
     use bitflags::bitflags;
     use nix::errno::{errno, Errno};
@@ -2565,7 +2566,7 @@ mod posix {
         let path = path.into_cstring(vm)?;
 
         let argv = vm.extract_elements_func(argv.as_object(), |obj| {
-            PyStrRef::try_from_object(vm, obj)?.to_cstring(vm)
+            BufOrStr::try_from_object(vm, obj)?.to_cstring(vm)
         })?;
         let argv: Vec<&ffi::CStr> = argv.iter().map(|entry| entry.as_c_str()).collect();
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
	`1`	`+use std::ffi;`
`1`	`2`	`use crate::builtins::memory::{try_buffer_from_object, BufferRef};`
`2`	`3`	`use crate::builtins::PyStrRef;`
`3`	`4`	`use crate::common::borrow::{BorrowedValue, BorrowedValueMut};`
	`5`	`+use crate::exceptions::IntoPyException;`
`4`	`6`	`use crate::vm::VirtualMachine;`
`5`	`7`	`use crate::{PyObjectRef, PyResult, TryFromObject};`
`6`	`8`
`@@ -145,4 +147,9 @@ impl BufOrStr {`
`145`	`147`	`Self::Str(s) => s.as_str().as_bytes().into(),`
`146`	`148`	`}`
`147`	`149`	`}`
	`150`	`+`
	`151`	`+ pub fn to_cstring(&self, vm: &VirtualMachine) -> PyResult<ffi::CString> {`
	`152`	`+ ffi::CString::new(self.borrow_bytes().to_vec()).map_err(\|err\| err.into_pyexception(vm))`
	`153`	`+ }`
	`154`	`+`
`148`	`155`	`}`