Skip to content

os: fix execv argument type #3134

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

Merged
merged 1 commit into from
Sep 25, 2021
Merged

os: fix execv argument type #3134

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
4 changes: 0 additions & 4 deletions Lib/test/test_os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1721,8 +1721,6 @@ def mock_execve(name, *args):
@unittest.skipUnless(hasattr(os, 'execv'),
"need os.execv()")
class ExecTests(unittest.TestCase):
# TODO: RUSTPYTHON (TypeError: Expected type <class 'str'>, not <class 'bytes'>)
@unittest.expectedFailure
@unittest.skipIf(USING_LINUXTHREADS,
"avoid triggering a linuxthreads bug: see issue #4970")
def test_execvpe_with_bad_program(self):
Expand All @@ -1735,8 +1733,6 @@ def test_execv_with_bad_arglist(self):
self.assertRaises(ValueError, os.execv, 'notepad', ('',))
self.assertRaises(ValueError, os.execv, 'notepad', [''])

# TODO: RUSTPYTHON (TypeError: Expected type <class 'str'>, not <class 'bytes'>)
@unittest.expectedFailure
def test_execvpe_with_bad_arglist(self):
self.assertRaises(ValueError, os.execvpe, 'notepad', [], None)
self.assertRaises(ValueError, os.execvpe, 'notepad', [], {})
Expand Down
4 changes: 2 additions & 2 deletions vm/src/stdlib/posix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,11 +706,11 @@ pub mod module {

#[pyfunction]
fn execv(
path: PyStrRef,
path: PyPathLike,
argv: Either<PyListRef, PyTupleRef>,
vm: &VirtualMachine,
) -> PyResult<()> {
let path = path.to_cstring(vm)?;
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)
Expand Down