Skip to content

bpo-44258: support PEP 515 for Fraction's initialization from string #26422

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
mdickinson merged 11 commits into from
Jun 7, 2021
Merged

bpo-44258: support PEP 515 for Fraction's initialization from string #26422

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aa8249a
bpo-44258: support PEP 515 for Fraction's initialization from string
skirpichev May 28, 2021
8c96355
regexps's version
skirpichev May 28, 2021
8c62c64
Merge branch 'main' into fix-44258
skirpichev May 29, 2021
38b16a9
A different regexps version, which doesn't suffer from catastrophic b…
skirpichev May 29, 2021
b131e51
Merge branch 'main' into fix-44258
skirpichev May 30, 2021
db9652e
revert denom -> den
skirpichev May 30, 2021
6336aef
strip "_" from the decimal str, add few tests
skirpichev May 30, 2021
b11ef1e
drop redundant tests
skirpichev May 30, 2021
5f7e32a
Add versionchanged & whatsnew entry
skirpichev May 30, 2021
983b67d
Amend Fraction constructor docs
skirpichev May 30, 2021
076b396
Change .. versionchanged:...
skirpichev May 31, 2021
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
Prev Previous commit
Next Next commit
strip "_" from the decimal str, add few tests
  • Loading branch information
@skirpichev
skirpichev committed May 30, 2021
commit 6336aef9287d3c07adce3cf32f052006cfb60f7a
6 changes: 3 additions & 3 deletions Lib/fractions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ def __new__(cls, numerator=0, denominator=None, *, _normalize=True):
denominator = 1
decimal = m.group('decimal')
if decimal:
decimal = int(decimal)
scale = 10**len(str(decimal))
numerator = numerator * scale + decimal
decimal = decimal.replace('_', '')
scale = 10**len(decimal)
numerator = numerator * scale + int(decimal)
denominator *= scale
exp = m.group('exp')
if exp:
Expand Down
2 changes: 2 additions & 0 deletions Lib/test/test_fractions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ def testFromString(self):
self.assertEqual((41, 107), _components(F("1_2_3/3_2_1")))
self.assertEqual((6283, 2000), _components(F("3.14_15")))
self.assertEqual((6283, 2*10**13), _components(F("3.14_15e-1_0")))
self.assertEqual((101, 100), _components(F("1.01")))
self.assertEqual((101, 100), _components(F("1.0_1")))

self.assertRaisesMessage(
ZeroDivisionError, "Fraction(3, 0)",
Expand Down