Skip to content

Fix inconsistent behavior of Decimal.from_float #5411

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
coolreader18 merged 1 commit into from
Sep 22, 2024
Merged

Fix inconsistent behavior of Decimal.from_float #5411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix inconsistent behavior of Decimal.from_float
  • Loading branch information
@crazymerlyn
crazymerlyn committed Sep 22, 2024
commit 5f75728ede6d765a8819f31c82ff226ccb41c786
27 changes: 16 additions & 11 deletions Lib/_pydecimal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,18 +734,23 @@ def from_float(cls, f):

"""
if isinstance(f, int): # handle integer inputs
return cls(f)
if not isinstance(f, float):
raise TypeError("argument must be int or float.")
if _math.isinf(f) or _math.isnan(f):
return cls(repr(f))
if _math.copysign(1.0, f) == 1.0:
sign = 0
sign = 0 if f >= 0 else 1
k = 0
coeff = str(abs(f))
elif isinstance(f, float):
if _math.isinf(f) or _math.isnan(f):
return cls(repr(f))
if _math.copysign(1.0, f) == 1.0:
sign = 0
else:
sign = 1
n, d = abs(f).as_integer_ratio()
k = d.bit_length() - 1
coeff = str(n*5**k)
else:
sign = 1
n, d = abs(f).as_integer_ratio()
k = d.bit_length() - 1
result = _dec_from_triple(sign, str(n*5**k), -k)
raise TypeError("argument must be int or float.")

result = _dec_from_triple(sign, coeff, -k)
if cls is Decimal:
return result
else:
Expand Down
2 changes: 0 additions & 2 deletions Lib/test/test_decimal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1257,8 +1257,6 @@ def test_wide_char_separator_decimal_point(self):
self.assertEqual(format(Decimal('100000000.123'), 'n'),
'100\u066c000\u066c000\u066b123')

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_decimal_from_float_argument_type(self):
class A(self.decimal.Decimal):
def __init__(self, a):
Expand Down