Skip to content

gh-130662: accept leading zeros in precision/width for Fraction's formatting #130663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 2, 2025
Merged

gh-130662: accept leading zeros in precision/width for Fraction's formatting #130663

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
caefd01
gh-130662: make Fraction's formatting more compatible wrt float's
skirpichev Feb 28, 2025
9425ff2
Update Lib/test/test_fractions.py
skirpichev Mar 1, 2025
d68c869
Merge branch 'master' into fix-fmt-fractions/130662
skirpichev Jun 2, 2025
e0d2526
address review: add news
skirpichev Jun 2, 2025
a54c7e5
Apply suggestions from code review
skirpichev Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Lib/fractions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ def _round_to_figures(n, d, figures):
# A '0' that's *not* followed by another digit is parsed as a minimum width
# rather than a zeropad flag.
(?P<zeropad>0(?=[0-9]))?
(?P<minimumwidth>0|[1-9][0-9]*)?
(?P<minimumwidth>[0-9]+)?
(?P<thousands_sep>[,_])?
(?:\.(?P<precision>0|[1-9][0-9]*))?
(?:\.(?P<precision>[0-9]+))?
(?P<presentation_type>[eEfFgG%])
""", re.DOTALL | re.VERBOSE).fullmatch

Expand Down
8 changes: 2 additions & 6 deletions Lib/test/test_fractions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1530,6 +1530,8 @@ def test_format_f_presentation_type(self):
(F(51, 1000), '.1f', '0.1'),
(F(149, 1000), '.1f', '0.1'),
(F(151, 1000), '.1f', '0.2'),
(F(1, 3), '.016f', '0.3333333333333333'), # issue gh-130662
(F(1, 3), '0030.016f', '0000000000000.3333333333333333'),
]
for fraction, spec, expected in testcases:
with self.subTest(fraction=fraction, spec=spec):
Expand Down Expand Up @@ -1628,12 +1630,6 @@ def test_invalid_formats(self):
'=010%',
'>00.2f',
'>00f',
# Too many zeros - minimum width should not have leading zeros
'006f',
# Leading zeros in precision
'.010f',
'.02f',
'.000f',
# Missing precision
'.e',
'.f',
Expand Down
Loading