traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some very minor changes to decimal.py in Python 2.6, aimed 

at reducing the size of the diff between the 2.x decimal.py
and 3.x decimal.py and thereby making future merges easier:

- replace one instnace of an old-style raise statement
- define __div__ in terms of __truediv__ instead of the
  other way around
- make wording match on an exception message
This commit is contained in:
Mark Dickinson 2008-05-04 02:05:06 +00:00
parent 979395b7a8
commit 8aca9d032e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/decimal.py
View File

@ -1206,7 +1206,7 @@ class Decimal(object):
return ans return ans
__rmul__ = __mul__ __rmul__ = __mul__
def __div__(self, other, context=None): def __truediv__(self, other, context=None):
"""Return self / other.""" """Return self / other."""
other = _convert_other(other) other = _convert_other(other)
if other is NotImplemented: if other is NotImplemented:
@ -1265,8 +1265,6 @@ class Decimal(object):
ans = _dec_from_triple(sign, str(coeff), exp) ans = _dec_from_triple(sign, str(coeff), exp)
return ans._fix(context) return ans._fix(context)
__truediv__ = __div__
def _divide(self, other, context): def _divide(self, other, context):
"""Return (self // other, self % other), to context.prec precision. """Return (self // other, self % other), to context.prec precision.
@ -1300,13 +1298,15 @@ class Decimal(object):
'quotient too large in //, % or divmod') 'quotient too large in //, % or divmod')
return ans, ans return ans, ans
def __rdiv__(self, other, context=None): def __rtruediv__(self, other, context=None):
"""Swaps self/other and returns __div__.""" """Swaps self/other and returns __truediv__."""
other = _convert_other(other) other = _convert_other(other)
if other is NotImplemented: if other is NotImplemented:
return other return other
return other.__div__(self, context=context) return other.__truediv__(self, context=context)
__rtruediv__ = __rdiv__
__div__ = __truediv__
__rdiv__ = __rtruediv__
def __divmod__(self, other, context=None): def __divmod__(self, other, context=None):
""" """
@ -1506,7 +1506,7 @@ class Decimal(object):
context = getcontext() context = getcontext()
return context._raise_error(InvalidContext) return context._raise_error(InvalidContext)
elif self._isinfinity(): elif self._isinfinity():
raise OverflowError("Cannot convert infinity to long") raise OverflowError("Cannot convert infinity to int")
s = (-1)**self._sign s = (-1)**self._sign
if self._exp >= 0: if self._exp >= 0:
return s*int(self._int)*10**self._exp return s*int(self._int)*10**self._exp
@ -3677,7 +3677,7 @@ class Context(object):
# Errors should only be risked on copies of the context # Errors should only be risked on copies of the context
# self._ignored_flags = [] # self._ignored_flags = []
raise error, explanation raise error(explanation)
def _ignore_all_flags(self): def _ignore_all_flags(self):
"""Ignore all flags, if they are raised""" """Ignore all flags, if they are raised"""