diff options
author | Mark Dickinson <dickinsm@gmail.com> | 2009-01-04 21:10:56 +0000 |
---|---|---|
committer | Mark Dickinson <dickinsm@gmail.com> | 2009-01-04 21:10:56 +0000 |
commit | 6a961637a826ab6293293866a43d5924cf1a77e7 (patch) | |
tree | 6627c3117a682dcc6f7a5190e65818b7242d72f8 | |
parent | 1de33270158b7641bd7260fc6f0c5c4b536438b9 (diff) | |
download | cpython-git-6a961637a826ab6293293866a43d5924cf1a77e7.tar.gz |
Fix Decimal.from_float to use valid Python 2.3 syntax, as per
comments at top of decimal.py. (But note that the from_float
method itself with still not be usable before Python 2.7.)
See issue 4796 for discussion.
-rw-r--r-- | Lib/decimal.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Lib/decimal.py b/Lib/decimal.py index 88e9bc8019..12dd7326cd 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -654,7 +654,8 @@ class Decimal(object): raise TypeError("Cannot convert %r to Decimal" % value) - @classmethod + # @classmethod, but @decorator is not valid Python 2.3 syntax, so + # don't use it (see notes on Py2.3 compatibility at top of file) def from_float(cls, f): """Converts a float to a decimal number, exactly. @@ -680,11 +681,18 @@ class Decimal(object): return cls(f) if _math.isinf(f) or _math.isnan(f): # raises TypeError if not a float return cls(repr(f)) - sign = 0 if _math.copysign(1.0, f) == 1.0 else 1 + 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 result = _dec_from_triple(sign, str(n*5**k), -k) - return result if cls is Decimal else cls(result) + if cls is Decimal: + return result + else: + return cls(result) + from_float = classmethod(from_float) def _isnan(self): """Returns whether the number is not actually one. |