diff options
author | Neal Norwitz <nnorwitz@gmail.com> | 2006-03-24 08:14:36 (GMT) |
---|---|---|
committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-03-24 08:14:36 (GMT) |
commit | bcc0db82dc9cb474d56a4cc63748583232d9524f (patch) | |
tree | 0107d20b29b61fc7dfd9626ee7257242f8cf6302 /Lib/decimal.py | |
parent | ed483ba63b9c03845386976bccff5d95df5b570a (diff) | |
download | cpython-bcc0db82dc9cb474d56a4cc63748583232d9524f.zip cpython-bcc0db82dc9cb474d56a4cc63748583232d9524f.tar.gz cpython-bcc0db82dc9cb474d56a4cc63748583232d9524f.tar.bz2 |
Get rid of remnants of integer division
Diffstat (limited to 'Lib/decimal.py')
-rw-r--r-- | Lib/decimal.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Lib/decimal.py b/Lib/decimal.py index 967f101..9815ab3 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -1135,10 +1135,9 @@ class Decimal(object): return ans __rmul__ = __mul__ - def __div__(self, other, context=None): + def __truediv__(self, other, context=None): """Return self / other.""" return self._divide(other, context=context) - __truediv__ = __div__ def _divide(self, other, divmod = 0, context=None): """Return a / b, to context.prec precision. @@ -1306,13 +1305,12 @@ class Decimal(object): ans = ans._fix(context) return ans - def __rdiv__(self, other, context=None): - """Swaps self/other and returns __div__.""" + def __rtruediv__(self, other, context=None): + """Swaps self/other and returns __truediv__.""" other = _convert_other(other) if other is NotImplemented: return other - return other.__div__(self, context=context) - __rtruediv__ = __rdiv__ + return other.__truediv__(self, context=context) def __divmod__(self, other, context=None): """ @@ -1384,9 +1382,9 @@ class Decimal(object): rounding = context._set_rounding_decision(NEVER_ROUND) if other._sign: - comparison = other.__div__(Decimal(-2), context=context) + comparison = other.__truediv__(Decimal(-2), context=context) else: - comparison = other.__div__(Decimal(2), context=context) + comparison = other.__truediv__(Decimal(2), context=context) context._set_rounding_decision(rounding) context._regard_flags(*flags) @@ -1751,7 +1749,7 @@ class Decimal(object): if n < 0: #n is a long now, not Decimal instance n = -n - mul = Decimal(1).__div__(mul, context=context) + mul = Decimal(1).__truediv__(mul, context=context) spot = 1 while spot <= n: @@ -1972,7 +1970,7 @@ class Decimal(object): rounding = context._set_rounding(ROUND_HALF_EVEN) while 1: context.prec = min(2*context.prec - 2, maxp) - ans = half.__mul__(ans.__add__(tmp.__div__(ans, context=context), + ans = half.__mul__(ans.__add__(tmp.__truediv__(ans, context=context), context=context), context=context) if context.prec == maxp: break @@ -2454,7 +2452,7 @@ class Context(object): >>> ExtendedContext.divide(Decimal('2.40E+6'), Decimal('2')) Decimal("1.20E+6") """ - return a.__div__(b, context=self) + return a.__truediv__(b, context=self) def divide_int(self, a, b): """Divides two numbers and returns the integer part of the result. |