Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-17 01:51:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix struct.calcsize to take bytes argument

Browse Source
This commit is contained in:
Jeong YunWon
2020-03-02 18:47:20 +09:00
parent 7f7cad3998
commit 197ef9cdec
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vm/src/stdlib/pystruct.rs
View File

@@ -18,7 +18,7 @@ use crate::function::Args;
use crate::obj::{
objbytes::PyBytesRef, objstr::PyStringRef, objtuple::PyTuple, objtype::PyClassRef,
};
use crate::pyobject::{PyClassImpl, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject};
use crate::pyobject::{Either, PyClassImpl, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject};
use crate::VirtualMachine;
#[derive(Debug)]
@@ -414,9 +414,12 @@ where
}
}
fn struct_calcsize(fmt: PyStringRef, vm: &VirtualMachine) -> PyResult<usize> {
let fmt_str = fmt.as_str();
let format_spec = FormatSpec::parse(fmt_str).map_err(|e| vm.new_value_error(e))?;
fn struct_calcsize(fmt: Either<PyStringRef, PyBytesRef>, vm: &VirtualMachine) -> PyResult<usize> {
let parsed = match fmt {
Either::A(string) => FormatSpec::parse(string.as_str()),
Either::B(bytes) => FormatSpec::parse(std::str::from_utf8(&bytes).unwrap()),
};
let format_spec = parsed.map_err(|e| vm.new_value_error(e))?;
Ok(format_spec.size())
}