Commit8cb2b82

authored

Merge pull requestRustPython#4386 from yt2b/fix_character_format

Fix character format

2 parentscb4bd51 +24c2b88 commit8cb2b82Copy full SHA for 8cb2b82

File tree

+15

-1

lines changed

+15

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,3 +29,7 @@ def test_zero_padding():`
`29`	`29`	`assertf'{4294967296:,}'=='4,294,967,296'`
`30`	`30`	`assert'F'=="{0:{base}}".format(15,base="X")`
`31`	`31`	`assertf'{255:#X}'=="0XFF"`
	`32`	`+assertf"{65:c}"=="A"`
	`33`	`+assertf"{0x1f5a5:c}"=="🖥"`
	`34`	`+assert_raises(ValueError,"{:+c}".format,1,_msg="Sign not allowed with integer format specifier 'c'")`
	`35`	`+assert_raises(ValueError,"{:#c}".format,1,_msg="Alternate form (#) not allowed with integer format specifier 'c'")`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,17 @@ impl FormatSpec {`
`477`	`477`	`},`
`478`	`478`	`Some(FormatType::Number) =>self.format_int_radix(magnitude,10),`
`479`	`479`	`Some(FormatType::String) =>Err("Unknown format code 's' for object of type 'int'"),`
`480`		`-Some(FormatType::Character) =>Err("Unknown format code 'c' for object of type 'int'"),`
	`480`	`+Some(FormatType::Character) =>match(self.sign,self.alternate_form){`
	`481`	`+(Some(_), _) =>Err("Sign not allowed with integer format specifier 'c'"),`
	`482`	`+(_,true) =>{`
	`483`	`+Err("Alternate form (#) not allowed with integer format specifier 'c'")`
	`484`	`+}`
	`485`	`+(_, _) =>match num.to_u32(){`
	`486`	`+Some(n)if n <=0x10ffff =>Ok(std::char::from_u32(n).unwrap().to_string()),`
	`487`	`+// TODO: raise OverflowError`
	`488`	`+Some(_) \|None =>Err("%c arg not in range(0x110000)"),`
	`489`	`+},`
	`490`	`+},`
`481`	`491`	`Some(FormatType::GeneralFormatUpper) =>{`
`482`	`492`	`Err("Unknown format code 'G' for object of type 'int'")`
`483`	`493`	`}`

Comments

(0)