Commit90a5b44

and

authored

gh-87790: support thousands separators for formatting fractional part of Decimal (#132202)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

1 parent0c3e3da commit90a5b44Copy full SHA for 90a5b44

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6122,7 +6122,11 @@ def _convert_for_comparison(self, other, equality_op=False):`
`6122`	`6122`	`(?P<zeropad>0)?`
`6123`	`6123`	`(?P<minimumwidth>\d+)?`
`6124`	`6124`	`(?P<thousands_sep>[,_])?`
`6125`		`-(?:\.(?P<precision>\d+))?`
	`6125`	`+(?:\.`
	`6126`	`+ (?=[\d,_]) # lookahead for digit or separator`
	`6127`	`+ (?P<precision>\d+)?`
	`6128`	`+ (?P<frac_separators>[,_])?`
	`6129`	`+)?`
`6126`	`6130`	`(?P<type>[eEfFgGn%])?`
`6127`	`6131`	`\z`
`6128`	`6132`	`""",re.VERBOSE\|re.DOTALL)`
`@@ -6215,6 +6219,9 @@ def _parse_format_specifier(format_spec, _localeconv=None):`
`6215`	`6219`	`format_dict['grouping']= [3,0]`
`6216`	`6220`	`format_dict['decimal_point']='.'`
`6217`	`6221`
	`6222`	`+ifformat_dict['frac_separators']isNone:`
	`6223`	`+format_dict['frac_separators']=''`
	`6224`	`+`
`6218`	`6225`	`returnformat_dict`
`6219`	`6226`
`6220`	`6227`	`def_format_align(sign,body,spec):`
`@@ -6334,6 +6341,11 @@ def _format_number(is_negative, intpart, fracpart, exp, spec):`
`6334`	`6341`
`6335`	`6342`	`sign=_format_sign(is_negative,spec)`
`6336`	`6343`
	`6344`	`+frac_sep=spec['frac_separators']`
	`6345`	`+iffracpartandfrac_sep:`
	`6346`	`+fracpart=frac_sep.join(fracpart[pos:pos+3]`
	`6347`	`+forposinrange(0,len(fracpart),3))`
	`6348`	`+`
`6337`	`6349`	`iffracpartorspec['alt']:`
`6338`	`6350`	`fracpart=spec['decimal_point']+fracpart`
`6339`	`6351`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1089,6 +1089,15 @@ def test_formatting(self):`
`1089`	`1089`	`('07_','1234.56','1_234.56'),`
`1090`	`1090`	`('_','1.23456789','1.23456789'),`
`1091`	`1091`	`('_%','123.456789','12_345.6789%'),`
	`1092`	`+# and now for something completely different...`
	`1093`	`+ ('.,','1.23456789','1.234,567,89'),`
	`1094`	`+ ('._','1.23456789','1.234_567_89'),`
	`1095`	`+ ('.6_f','12345.23456789','12345.234_568'),`
	`1096`	`+ (',._%','123.456789','12,345.678_9%'),`
	`1097`	`+ (',._e','123456','1.234_56e+5'),`
	`1098`	`+ (',.4_e','123456','1.234_6e+5'),`
	`1099`	`+ (',.3_e','123456','1.235e+5'),`
	`1100`	`+ (',._E','123456','1.234_56E+5'),`
`1092`	`1101`
`1093`	`1102`	`# negative zero: default behavior`
`1094`	`1103`	`('.1f','-0','-0.0'),`
`@@ -1162,6 +1171,10 @@ def test_formatting(self):`
`1162`	`1171`	`# bytes format argument`
`1163`	`1172`	`self.assertRaises(TypeError,Decimal(1).__format__,b'-020')`
`1164`	`1173`
	`1174`	`+# precision or fractional part separator should follow after dot`
	`1175`	`+self.assertRaises(ValueError,format,Decimal(1),'.f')`
	`1176`	`+self.assertRaises(ValueError,format,Decimal(1),'._6f')`
	`1177`	`+`
`1165`	`1178`	`deftest_negative_zero_format_directed_rounding(self):`
`1166`	`1179`	`withself.decimal.localcontext()asctx:`
`1167`	`1180`	`ctx.rounding=ROUND_CEILING`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Support underscore and comma as thousands separators in the fractional part`
	`2`	+for:class:`~decimal.Decimal`'s formatting. Patch by Sergey B Kirpichev.

Comments

(0)