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

cformat.rs: handle bytearrays when formatting b'%c'

Browse Source
This commit is contained in:
Daniel Watkins
2021-10-28 16:14:53 -04:00
parent 380653b6cb
commit dcc0973b03
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vm/src/cformat.rs
View File

@@ -3,7 +3,7 @@
use crate::common::float_ops;
use crate::{
builtins::{try_f64_to_bigint, tuple, PyBytes, PyFloat, PyInt, PyStr},
builtins::{try_f64_to_bigint, tuple, PyByteArray, PyBytes, PyFloat, PyInt, PyStr},
function::ArgIntoFloat,
protocol::PyBuffer,
stdlib::builtins,
@@ -447,12 +447,19 @@ impl CFormatSpec {
})?;
return Ok(self.format_char(ch).into_bytes());
}
if let Some(s) = obj.payload::<PyStr>() {
if let Ok(ch) = s.as_str().chars().exactly_one() {
return Ok(self.format_char(ch).into_bytes());
if let Some(b) = obj.payload::<PyBytes>() {
if b.len() == 1 {
return Ok(self.format_char(b.as_bytes()[0] as char).into_bytes());
}
} else if let Some(ba) = obj.payload::<PyByteArray>() {
let buf = ba.borrow_buf();
if buf.len() == 1 {
return Ok(self.format_char(buf[0] as char).into_bytes());
}
}
Err(vm.new_type_error("%c requires int or char".to_owned()))
Err(vm.new_type_error(
"%c requires an integer in range(256) or a single byte".to_owned(),
))
}
}
}