Commit10c9db6

authored

Merge pull requestRustPython#4392 from yt2b/fix_prefix_format

Prefix format with padding doesn't work correctly.

2 parentsf2bab80 +c8c5abe commit10c9db6Copy full SHA for 10c9db6

File tree

+13

-8

lines changed

+13

-8

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,13 @@ def test_zero_padding():`
`33`	`33`	`assertf"{0x1f5a5:c}"=="🖥"`
`34`	`34`	`assert_raises(ValueError,"{:+c}".format,1,_msg="Sign not allowed with integer format specifier 'c'")`
`35`	`35`	`assert_raises(ValueError,"{:#c}".format,1,_msg="Alternate form (#) not allowed with integer format specifier 'c'")`
	`36`	`+assertf"{256:#010x}"=="0x00000100"`
	`37`	`+assertf"{256:0=#10x}"=="0x00000100"`
	`38`	`+assertf"{256:0>#10x}"=="000000x100"`
	`39`	`+assertf"{256:0^#10x}"=="000x100000"`
	`40`	`+assertf"{256:0<#10x}"=="0x10000000"`
	`41`	`+assertf"{512:+#010x}"=="+0x0000200"`
	`42`	`+assertf"{512:0=+#10x}"=="+0x0000200"`
	`43`	`+assertf"{512:0>+#10x}"=="0000+0x200"`
	`44`	`+assertf"{512:0^+#10x}"=="00+0x20000"`
	`45`	`+assertf"{512:0<+#10x}"=="+0x2000000"`

Lines changed: 3 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -504,12 +504,7 @@ impl FormatSpec {`
`504`	`504`	`},`
`505`	`505`	`None =>self.format_int_radix(magnitude,10),`
`506`	`506`	`};`
`507`		`-let magnitude_string =format!(`
`508`		`-"{}{}",`
`509`		`- prefix,`
`510`		`-self.add_magnitude_separators(raw_magnitude_string_result?)`
`511`		`-);`
`512`		`-`
	`507`	`+let magnitude_string =self.add_magnitude_separators(raw_magnitude_string_result?);`
`513`	`508`	`let format_sign =self.sign.unwrap_or(FormatSign::Minus);`
`514`	`509`	`let sign_str =match num.sign(){`
`515`	`510`	`Sign::Minus =>"-",`
`@@ -519,8 +514,8 @@ impl FormatSpec {`
`519`	`514`	`FormatSign::MinusOrSpace =>" ",`
`520`	`515`	`},`
`521`	`516`	`};`
`522`		`-`
`523`		`-self.format_sign_and_align(&magnitude_string,sign_str,FormatAlign::Right)`
	`517`	`+let sign_prefix =format!("{}{}", sign_str, prefix);`
	`518`	`+self.format_sign_and_align(&magnitude_string,&sign_prefix,FormatAlign::Right)`
`524`	`519`	`}`
`525`	`520`
`526`	`521`	`pub(crate)fnformat_string(&self,s:&str) ->Result<String,&'staticstr>{`

Comments

(0)